From d524d452bddebd05a21a9e103d674505310f28ac Mon Sep 17 00:00:00 2001
From: Kima <kimavideos97@gmail.com>
Date: Mon, 28 Aug 2023 18:25:20 +0200
Subject: [PATCH] some progress in goal planner (started goal state)

---
 .../images/subject_covers/math_light.png      | Bin 0 -> 19672 bytes
 filcnaplo/lib/database/init.dart              |   8 +-
 filcnaplo/lib/database/query.dart             |  27 ++-
 filcnaplo/lib/database/store.dart             |  16 ++
 filcnaplo/pubspec.yaml                        |   1 +
 .../lib/common/round_border_icon.dart         |   4 +-
 .../lib/pages/grades/grade_subject_view.dart  |   6 +-
 .../goal_planner/goal_planner_screen.dart     | 202 ++++++++-------
 .../goal_planner/goal_state_screen.dart       | 229 ++++++++++++++++++
 .../goal_planner/goal_state_screen.i18n.dart  |  39 +++
 10 files changed, 440 insertions(+), 92 deletions(-)
 create mode 100644 filcnaplo/assets/images/subject_covers/math_light.png
 create mode 100644 filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.dart
 create mode 100644 filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.i18n.dart

diff --git a/filcnaplo/assets/images/subject_covers/math_light.png b/filcnaplo/assets/images/subject_covers/math_light.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb3e2f518951b484985709a3292f0c0d3fc50c07
GIT binary patch
literal 19672
zcmYg%by!s26Zg_30wN$tDG1U^iZn>4bfa{*q~uZ(0-}J@-L-T#D+m%xr?9Y;G)u$M
zycfT}_j%txe0bb@&pC6>nfc7jXXZv|sL2x((h!0`AYw&@H<}<2<}L_?VT_Lp{E~<k
zVFUgUI4c;qfk2ec?*3sYYBKKwKVrCP%1eXFhiEr}|6tolsY-!BRnbIO?{PpN6|mwP
zDQzzd)I4#Vv8VU?`8v{nG?lB4>w}^N!MwFRJ?__emITffj6{X|tnbw4UO#z1Y`|h4
z`m;PgFh9vMR;6<G{f_~HzY6yi=zSB4=zgTRn8&m_q!Eb7<%duixK45X{QRfO&#GaR
zsMnDoH=(&@YxlNEr$NX5M7eDadU<-C=GK%Ct^P0pg_?<>&u<yF|5RCIJgNt;>y{b1
zYmgF5yQ2*gCfB`@fh(_4alX^g(6|mbm@7CP&4%M0nb!SEyBJ(5H*IS+(x@xU@PQ7u
z!gk_G2U3NGo32k0(VO5SzR~G$izxpiK5xkf8xynhXrF{ShYR_#8>_HA#erL%qxN{d
zJw3eR`g3pnpkD1(!Ha?6WiqL}vE$iF98lobL(Ue5f*#HTV~oH@c2pqH4=EXs3gO)s
z^6KZ)YTYZrYmZ*aBWdyA>jnlH)2jx2Vl3q#$*-hy7$BEKzMiN<Z$UANVZHLW&P%LS
zMB>2*1X;y%Pz-i$KM1s}6nysS@O$j6@Y)7n*y&@mIvQKKmD<Q^R^+t_uw3@?eNcEV
zc<m3{(&(3K7Pk*EU$$D-y-8BeGK7Ta;OuqtNteevU(+r(se!kjG-834-*7B8!{ICh
znN0axkWAsLbnyf_Wc5PYDG`Vn)IkR#rJ|Xw<0_C(amezuP8A15NJoo+7`bc5kUJyv
zk76z^)-V`(u{}YOw8zSBvliAh>fG~c4?yPM76DOGnDV=G%L>YbvsL170(BXI1#>8^
zyoMC*ipW7-^mo(er@dKlpqH&<0NKkq<AL66nnq-BhYu2fx@hknQ^+rm7mRI%R)IA5
zf`EnDg(FBV<}m&n8!y5v-s}&aY1yL$g}?mwII636m}?6e;5tvg*EKtjhYd0hzmr6%
zq##dsHJ+#t2ekb4-w%mhy)zMRH#3wD8X(5c_<(6VvLVd9X?mW)0V0(_VS@Vdz?7bG
z!#=hrQ^`wBj_3bf+n|&VMWVidQ*nSJ8W^-3v3Q^H<xqwg2jp~TG*Fy5@$*OGzgU`t
zt4ynx`~yxL62rw_{*|aqBmW!VI&H=D%xfjx6%m-XI|irWAjx}Va~RB>6}J}^BJxqR
zqx<C@ZPh|PFkwM>_fPr}=tZz5;qf@}w9CM#p16l1+fVX8hRPK_uO5(>tik#uU@!fb
zihxN*SMD<s;AZ%26^oZOsxPHjv<%QUURv&cY1UoKj86iqCt+0C>ovdca4(qK{q~W>
zah-@ZQ2%KoR(K0WvNvs;Zof$~qMSWrC21v)6lt`X)zyWdDkJon1C%Q1?zI~KWZ~Kp
zdye{O?Q_u{+Dq)RABjn|tbSSBa==CsfD_XKbiidb$s#O7=2y1Ss+;@UZ5F8#Z8w3u
zP5%?sh6^)B&QoVRQj5FS;!Bo=qqHj$`gaATN;WW;i%NE}9HNl{lTB4bYp-szK$0p|
zCHDdwp#@v>Jo$lpN_KilGq%s_<e|C4M&KxmAnWmwavijPMAWTkm~1g<IqHi@V52M4
zS1mJ+{jbS`^0X|S+J2N0|3xTHG3Y@Ma7D!YwLHly!gab@bik6s*15IqRxCVjX2lqR
ze*m>qAhL<-u?r3t0$a^;m#rw-Ia7g{aXaWFjaTypZLk%E7|RI8%Y_B;xp+YjJ_GZW
zL+2qTO}yxg-KdGrgns<Ec@u&wN^XA#U1~^YF_=mJ8+rkS1W*jS<O!BDvR~$FlMO3-
z9Y_ADKiq>S@`57X0Ow&dE4Vat=tcS)T0At}ygl$%D$bZKbf@X&zP5#=l8(ozEnbZ6
z-I=YW<RWNO7Y-8|?v<OtOp&Mc4V%}7-{*DxOJ`r`qUd+od9>$N%q5j1){W0S>Ly+F
zl=RHYe>itafZjx5sDOUFTm1P6>ouw3uZ9+%ldW%c*DC^heM5gI&V=>F`9tuqs*mS%
z#Q8^BR#&oA$oIn*PMp;*&(72kj*sKaJGi{MbJr^x%_~J<$y3yz2uWwW7#z>(edF|H
z#Z;A6;)LiPhx4%4EG)EDrD^LFZfl(NlPpBT-};N|TI5y21Dw1081|?DBQ>-FSxPy@
z54+{pK_YVVOH&J4rfW*M5sqlUQlo%_MY(FuNAZ@&QOZ0m<8=7#e!qTw73Y7CJhTsJ
zQ7(>a$fa-$ILB)~F+o88lR%OKfDz>xsI8eML9<ObP;SJ|(m`#=ni_bjoz0Ws#|AGO
z=P5wp!jy%W3N>wRqPzY}L}nY!Hy7Jz#V_6&dfW7;d^C?A!x>&V|AhG+Z@ewkc;4IU
zeN>-(dBObK^s3`=wa*^MxcF(!t<~G<PZDA;v|aT4e|;uS1q8cOhO!H*Q=~^(rIT@u
z^`J&lhahSoGoE~|-FYd<*4fF)Y46Kr=29zzS<*q((XI8(vs+l+DO(F@<N<)`3QXXL
zq_PH+2Hy$AlyXM$HHJ*##@kZJCy?X=z$fH=vxrJIG^@=t3FD|*wfH@7J9<vd@VKQ}
z3&coZ8;=nqNHd#mx9gc->vk_vgU`19%Vj9V5jN;YARw1&Esk|_y3A>+4Ao=aS@GQV
zg@88B7doD0tvtS)X$*fw%oq|g+pMxdlA3o*$-;zp)7SjL-@G;KkAE@TXp}cD6B@Mp
zHZh)mIRZ=MZM$4Z7^4<!GI^8`wo)KQwhb4&7~E^ub8~GyB_a)n`=~AT+hg@rhMOe@
z?9Kf5{#VfZ7=d|r=GE-qBwCBt@_S-(*nhbzqVJ0c2;?FK*f{fcqOuI6(qVvUEU=?P
z6Uln#lR^O5i!WBkMluq|Ftzn)-bCI5F-8Gs`$NI#Jv&v-R2|6u^}^Y2p}!lWxi?_;
zT~Oew>>fHv^E5Gt?rzJTxIFh~k7-(A0=8NQr^^g62upw};9I%~C_F(CFGNK-8Ll_v
zSI^foNp@*s#;_+ePOYa${BN((mo|Wp4PVS~p@Y@hjGx`M<!6WbN)o+lSn!8bAoW|l
zs&tVu4&O#Yi)Lw#R(S#pkX|dq7$C-S{9S`}3eV(y?hwzeB#S7l)tZm)?%$FY%b&FC
zZB0|q!cL4}0xPkUT!zdF-05GTzyFlbNh*=f@qM^4$%IpgZ62z4CC&}?JcFgX?1w*=
zXP0jAIbTf_a9+>D*>F*>ceq(s&)d!%?mZ9SGaIT%T31&kcEpl=KsLu$YCDtKb=1YH
z(-XxZ;_)@{BJ@+E^T0uA9Q%soAZ6RfA&KGJQSaLk(u$AfTO@lZYkT&<t|yH)M%<0>
zy{pSsuv!?X16&<UVp%@1^eT2`x7F0R{p2%qj2)`xl$UN+dVeE&s_ZSbKdEO{hEg(F
zLo@KBd$!svI*MNwuACgqeT<&T4gFqKetOOOYj~<2toP5GQr8uEdJdn3tQ)%)qEP&|
zEmEK}@v{yR$ApJoTg8PJDvd*m_-n(NFw`l+Nur=3nocAkb}X^vx<s$SU()>V-)6Ck
z{HH?m78zEn0XORb;uI1_pqWnbU1|Z{IFSORO)`n_yp<e?af!2PH{(ER7!JfMq#a_p
zJ2^tvQM9rF+3aH7pa(<S$(!E=t859dV-&E__fi%vV^#*8354~F*g?ipPwC9|U_Gh~
zb7D?^Q<#kI6aJebm@w4bvAzdRqyqu$$Tk7}ihQHE9!r5U2!fl;a53*D(Pvgf2#OfD
zp79(w-1o-_3^CVBzQ_J0v1ZLH3Z`)~H0<>FcFSq^0V7RCDigz1=gR~hv)v7pOxXR^
z{BvMg?=>;Uf*zJPwy_v7`q=2N1O@rJCzi?{3Xba_avieoJ@Bx-#g5?S)0_p`-L1)z
znfiz0K5aHO(>Us<i2BJDZ!OH$^>3x3ou!1JK3V7Cq<4n)0!c-LjCSQT$3(<8kf|7g
z1HB<5XZdXX4GMU_H)Ts7NI@_Na{AZayP8`Y4BK{#Ru?@uXaz|IeN2?TdZy<HV(imT
zOL_8|Yf>9QSN#1MB|-)h1bXvzG2_X&s&biJrG^fW4Ukd?K|T+>;;N&`4~42|0|`Mm
zeuo&7b!vhkF$?r=K;&WuncLj}?`(TDV8n<ku)!jGLwgE+;Lt#%#6b|bhc?N~`b3of
z-Va{PzyKD7dH`Ga_r{3py?6bAhQN^oM?gW#cbd>_F{P$l>YM%Qp!bW-qepm*>G-=d
zF|jc(-%>~#C;jwqV9l_I5=S_0i`03b!)*+_wJiUbRh9*F+@D_|1m%Isc-i#!YA5U~
zH7F!$y|kwGlSazReB0JuuSh~VjJQBC4`M0M=2d@0`1vQe!b8A_sCDm~nJd~0W@d&N
zx3gU*-`k$Cd(9f|sJ4KbBd3OW4{gogSF|jUGjDKLu$6(BY4K_a$H24#Wtyn>Vbpk`
zy7D97%F8Rl_*Ts>D#)*A-kk6y-^M5E!gFtzRnSSEC~5B%H_wkGih`yv6be-`co`p%
zI<4^cYWlPHaDQ@U=(BL`6w}93RTe#+4*qgGS3MHK&m|s-a|~8{NrnBDxF&L4#cVDQ
zY<%s$6?e4_yD14-O5gJ>1o9a5<s1w2TRS+3`lbGp2F>3MNM=wBWxO4n;!Sah@7K8K
z&uv$+ZYC_XLhk6qn%tGcb+hYFSL-CmMWu^Zt2G?q!HWVp#!{0ivaKa$Wn6J+OszUs
z4*$)#;p{f2$$tOcTE20MZqL@f_zz104;a+WX=famxQ5b%$4}}i{K~dRvSkjhj)vhg
zH8xgWXUmBv4Q(iJwby~U0nEQGV9o;p-sOj>+M7O(rSL@5yOrpcy?!1ZvfT_B40FhA
zDivIOHDpa7)e|r`Z{v+LwfmIg^?0mSW71g3?f*;T@*UX!OXE_e@@Yg*Cbaz4uAkkB
z3ifn_U7uR`Ag)x71(uU?7p_$3V<<)1Z?e-&j_<2nX03nY6sbO8?<4&$jl0PVJNF*R
zAj|$TEth$2Ao{dOeu!2i@03{37zpMLB+osdrjI$*R9_;F1QjFi6sV+*!s<8r)x3@z
zi1}@_@cp>xw27gY@|nWNa4lHgy$-Q5A5RZ&)jzndEP#QG*dsZ~vj@Wv{unX*DNGsh
z`-hQ~6k!>@hl=u=L5mrh>EtM3I|0CUY{|f}-y{9H63=J;g!bS_YT9}{deNgskXhrt
zJ=GR1cAAujVe~04-fDqvt#$%>6Mr{5J2`p5@kD{n39^_Z*|Yt6J{Vy@iq9PU*#jK8
z`JJVCul<slxTvvEPwlBjMo|hm$To*!*jE&`v!C#-yNYODb{O$N=eTy91&g_#+s@UN
zB<>eP?ZMYC5W+#Bj;23(cEyv=d9(+KK>RabI#A_t+*KsBdo!B~@;19yXOF<VlDx;M
zxmJ(u;!u1&gFi;VPY8C|v@1(n%J6&aafoz!U>B(^*dW8ar(Ia#67ous@<ysgZXY3Y
z#6Ki!`}1N5P{I*3L^>Ftp96-xHrBYp$<}@<K-i;Y?Y}1zRa>O@L9jy_cnoUPR?FEF
zP`8wO(padHtudge0$c^aMyvqYBBij~j~CeJIJ;HA#Q$VWeibvo07>!+Kgbk}*S9LL
zC!HJ5>mJuEF;^rZ2j-GAP+Mkl@!Q2lKa8;azo4VE8*?`D;lX+HPeb7KH--7XW4N_Z
zt<|v!)FAiA{V3GycBGjv3F8cHL}Dtl6#nk!kJ!e;R&fBsil%ei);(usoi-+#!%pd8
zq38#U9m~2)9?VjYe#Sj`tNsrQw+1mm0$z6*-l(@j0e_(0`VX&~9HSlBF{2-XA@91g
zA;uUn4_zG6Rkb;ID9~{ucEt}oIkj;#!j9<D+cK<FubtfoQv2^~g-S4jG$evV40$Ml
zZ2<=a60ol+O-B2kwgP~DZLCNd1R?CQ`fqPpl)v_T8hcV#uffKDr7&Wc%e&y=%m8TP
zEc0{KvER*~KNQjVVe+&iUcUZ5VIXq^!eJ^N8#rjmx&MLiS`I>D%X}i4zJb#r5u}jP
zh=b1k!HA8{i(L5+Reu^=!%{X(AzpAMOh&u=O1>M3_<9dQ7BigbLWjD(ZKrnuLe^Ar
zIrMxbseVqO0B!9mtnh^~1J<%s>h<k@IRT&q1Aosh!d!Xb@8Xuv{$OD;7B7#jB{Y_J
zV538hx|AKeO{z2~e)8+mHnTc;BL~;S%-?NUWE9s|Jeu1j49pvw&&nxpCQ;~|wS3qi
z*74C0y86t)`RB(Ea3lxlMRy&rH*S$?cQ=<E=?3qLal-TxG$KKO5%fbv1~Q?8eq&n4
z)X1toT20=NI#4S*YzK2d1Hr4Et^4&XlTkg7NNaw}hIgt#9ARFN?z~Ba9E`bg76|+L
z5@O>jyAZnc%s3!ELl?{KK#&4fS+i5zRKvjEXW5e;vd-#7vTZGpT1_stY$BaVa@jk-
z7em)fx8h;<J)T2v%dUp`QHNOe?=OAxs@B$~Ja_ic8;4;hl{7VSvymIUrK<M;aKjoN
zFPB>S1{i}vp;5wrl<7e^xqBUcYa{4eo57dN&33chGJ7KL?wb(Bljn^F#?4wA+hO*&
z%)xFiVI=Ik5pvGzj3^xSzrcmn`U9?6iGdOnIMuJn76aqXM=y!H9rvzYqS0}g2s8g1
zjq~#;M%9mx#&FqAvchC9*Bj_wIlntv?v8v$jK52uo#c1VYq`!V8@f9%ZX^x@4HimW
zNuKvAqG;JdeTnz4gZN$YA0ma6S0>RIZgZUZ^A4K1CNZzp5L5FRd3xQ_li$XSql~Xc
zMz&N<m-#+Z<A1X<kU{bXf8Ba1DCi-VvIuBG8b#Qy3yxjGAnkj{H(7eNb)ek$!xVYl
zlIJ5QzJ8kQ<vQb2TM4&KukLx-69z#rDZ1eXKRkf2gk0TMlxNV*vm5LuGqR7|;USWQ
zx1rni#B9~@o)tt@%+K3UwbAuBozF3iA;l#F)t~uAPks^^Op;huD84|l641VnHo)04
zG5j>mAy5KeFF(v)n&V=?dxq656a?wqsGTq;1Pmj$Rin-*#m4A-M``mLtiji8Vtg)8
zrHV_rq#z31fFdPdR4;?rX1#-BVV_Nm40GNA@*2(aOoF{letmKJ#Cy3tV(&HifKY1C
zq{y%d1Xbte{yg)9(+ks3t^~!qDzF|=NOAUrd=Y*BWXE#4@b9>}LX8aMo#Y>HTsGh~
zGtw*-$f=-6Bk>m31Ku=Kb0R})P_1OstT-3>qT8J#@ci-NdMxcUX=aC<@Pz_f5F{uM
z41hw)tG5Dr;(I)qCQYv}h0$=>6&!&rsimq1uCT1KP#6=|Z2mH1|L|RmAvPLYaUD>Y
z5b?JHtW>|GR|Vht2n$sR`Jeq_K#Bl)6ez`}-o9lCFnpr6{=PeAj{tG?G!#&gA5(zq
z*r$T7NpHIob0fB%QhD}U_`?T)s9?4Ia+e%5C{-tR;`+eP!RFzle^xOt<ogydWF!=-
z_Yujlgx?NQZGe2`SWQR<!sb3I*qJN_sW=o>Of_}s&J+|;A_?F+`BM}CfMjFRll@Qb
z^PwEXW_W8Hrn%37c*wz{4kZ22b$-`Bdp5&5s;f}-nTSZ$6LMgk_hzp-pT~a8wtt^9
zVmoZP&yta7P_W~-h{f=y9SBoK6OtFM=NGK9*-2T38FF~9Wik>AXEVJ15s%;5@4ZtB
z|Dd9ro_fyLEAZm24##>&>e<f^>T_)nbT6_EvPyEhPjZqd{Qd<wX^NG6y`y-$2fE|k
zzUHb0*!+a(2e;Z|wvEg7`hj~&>7QL8Eo+$)3(v^OqXNRLM8?G`Yz>$^surEhUi&Yn
z^~TdJb8V3_ssQ)UI|kfC9B|#7=P78<^3v7;;hSqFhVyV=l!Mt3WIn&PSFs`LBaY-R
zUD}z~@6@oG72J7$LXbZN<m-pdXW#4yKj0DSqwTo9vn=z`?alqx$qXyBm+5E~C!Fm1
z*4450n7IX9zmPN0so_7=8qKgjoUo31-Q+kd==RL6s~&-yukTD`da!ZMQT}LW$jMp`
z10ZbGK>>!)b%OqWA{|!l-4@fbEY*T7(2Y&Nsm<XH8fIo>9pv{(2tRNH8{?*Dn|}7?
zOaD)l$scVe<0kBd<6+PBMj*4I+m1({#+bUzqxFuP`Mn?srijz7>dvO$V1EhNas@2&
zoHvFKR>dY>*C%~s^%L7?T2#=s)6ewR)fbzs<{w|bK51l?QFD$sl%A9y0`j@CLk5?>
zhuO+*hE1;dSDidpoi`P}s~m08@OvZt)3oh{Q#{Mz6^$lOc6ljI(o8tlIN|NTM1)et
zMa0;sx}*s=-JOqLEVb+Xy1FB;zOeMBa%f=TAYL~vYfNT3^^#H+{x+s81OOl^6xwuX
zz@s{)Jqg+Gz+?4H{;moC$^;60b2gGX<x~@i#5n4!`gPQr))l9_u4*N2)2?<e=@$7!
z>wCayUekkouqb96*_?%=Z_vD@^#e}rvct`ej7}XrMBzRjA3<&{2IE`ZK_hm8NsDFQ
z0McdkGDJ-TDM=7y$I271V`y5@R&RF(9HTgzg9@_crfHvy0Wuzne`GLLFR7WuTGW+k
zh#o<%G-#XDO81k_S(J)?c<vbKyPV$~0qs~R*RDz(;IvJ~2yB{cJ2B@gO}S-JB>xwe
zh>&V8;Ur5tN52GcuJ8-+woYU#e-sc4C7F~4T@n+O$HpC&?6dqNAzQ2oUZl6EUq6s8
z?W85radWNWy~*MqqA;`$gxboE7?15yS*m_GT@JX+(NWxWsYs9s9KIg}F+SPdIsAiL
zZC}HwO^oa^Ca55M1HbnIkFL~GO>FJQ&3)pB$A7JrOqKLln9!ffA3u{}!MfU?ov)oK
z0K9v_Yt~t}pp=114FJeU6dHj|SZ9ft#T91b(xUoKs3xm8<aE2tk=<d)T2tQM&B{_6
z@3wsM4zY61R4}81`?>UFnsMppFtP8WcY@m0Q53=+tnxrPeDI2Jt%K@W<P6=XM>0MM
zCR5{72+i7zg)Y*Y2}=zY+zDHHIF^R$1C}fpp`<3hS0iS#`n{~mur<73WQ5*s^17j-
zMN7jzQ@F|ljRD=;lyr{HKA$Zatet39F({(hVc}yOl!4#V5R5}01oCCqc!4ndF}6Xr
zj;G$!tZXs(<Z1E8rzIxO#V>P>#D^!BLYNwRG&-tnW9<UDwd)pqTRv}OEwm+z&^7}4
zyl8Y><95vpk7tF)nsDGYv;>uo<ouSibAb=EP@3^%=FR#G!?)~fQ0d3*tdBdyJ`aQ$
zsg02Cb*f+X3muJJeIeoE>lG!(cFnLF6udWhJ#!X{hi#Axev8PLt?j>ApTAXnQImyE
z-_HOrDCvADLWuUgp}kD2TVc1zdHP}^))-Cg0Ao$*H2243#uwWQ5VvQgFo-jRvmXBq
zoLFH~th$)Lb`P>GXlMytNt)gvE#vExagI(7xS5{DM-j7U_`4i>^vp)n$4@zjCQw^W
z_MUSev|fFU27s$BtRbYWhWv+>q!O5~oc~jOkMA`KCU0Buy?*EgGnWDW?#rWF(IflB
ztS8+|h1WH0_HDh@sUAw(BfP;Xhsf$K6A#O6>){`$gmu+2XiN9OOGC@7J1UfQ{TXv4
zf~r5j`v~t^sRb#A>X#WiB|h0<4ge}%Vsb-KQSc=yb)v2HhQ2tCT`=4!4V+_N157($
zcypX!5_(XT$_4MoL)%5(Bhn;$Rp;TENDwiU30s|}DUaF~M;Th(ZXBWsX{K5#-RS-H
z2mlrMUTDTxD+Kk*nLs#l8M9ASj}>iGvp@wSIe_!~#h+((c`Ww$L)C@dcd2}>{0<|$
zfhF4w|Fr^jxSmSBv6G$=*K}otky!iL(6G{@C5FU}_oMb#bwuVX0rX<rwkjhm7F;H7
z2SbN%CL<z0HP6&q$u%4gC>C4E@sPA&TJ{Qr?PZJM#s-b-8caQtjYCkG?J;aY)<54B
z#IBEkGMH<@3wGsM%3kQX(+{0=Jvd6QJe#iIJk8Z>p>ladtenvUIPOD!FfTD%1~uj0
zPGvv~c(p81R5zpOqWAoo3&J#(kZiMR4!<X31F{@b$@YUjrYt{>Mw_|EGHQmPALZ(>
zu-se<nI-6%J*Jp&s-7(e^TtznHhsvk=eX14z^^5OwM-tgv(`XGjh?(E(^qOFX*ptS
zC|XMfB1r}HXuox98+*OOi^W*epB+7tVeIc^(~#`-q_L-~k8gbj)`oF|MCDeTHz1nb
z_#~?4ku#m4&@U#|Aj_!F9>jhjr(JH8A3yGrcj0!3;jW=CbO?eVSYIk=4~P9z2bSZ3
zA*~uZhCKit#9-2Nsg)!6y7Juyte!XMv2I?p^x!`jt}dMe90HqYH#RT>z!9pA#Jn?v
ziW$|l4Nz9VuB?i6YOSmT&IP&n6w<PM*jJU;E6Ne${Rw=`139BdhS~1e#qZ10j$ghP
zpa%}~9R$fDHGkEHfP;BY54Sv+Y!9S$Wa0N7l(cPZVw)FUDHobpGB7MB4fVOVT#60D
z2{h$dOAqtKe6Z0)cj&3a^{_~*^7*7`vs@{Tp5Dpu8-Svdxm-I$r2(oMGQz0Kzo)IW
zH%)Tj4Lc(4dF`$Sa`#2;iXZJZ%fuL>G8z&+nrzADn5N!t{6#omwH}Q2ff-Rc+xaYI
zW<||rw#iaKX^pE#2x}tqsS)a`%m7sou^afQ2+pRpL9_pR29d!xVT<%Hwa(jQG#avI
z%dKZ|UFCqGP+;WKGe6YS&g6J!`n+au*~36OOWu5&w>_ferEfxjG3ui1yTnPQ^*peu
zEx}|ZGEVJ$E8Hr*RbBtxGrZ}>pn-7@_9a5|0<VM*BL47o*PsNZMtR#irraPyBfBWp
zbGO#3!;u%h&G4NLNPi8jNsV+ISJx?fxIe^jyvCl<-SRA`5R3fK0_Nf3E0cGQ))=jx
zQ7ypepo|%-lH}BKsnEkF(xKqu3(r575Gky{v8iAGlW|;jmr3$gTs<S1`8&cp4ji=Y
zDz<ye9~QS*eH2mN6JT>n@O$QV-QUZw)_BiOsWUZ>FDitqSF;$8Y`<gtw^VNqa$c<Y
zm8M2wzhH7bE)+!-@JoRbI>sBU51<Dn9Zmh{Ve9w)OD=T}E{OFuR?tAMEG~wjwPEBU
z{r9S;Eq(l*49%AMM2TPOI71e>fqaIJ;e}a|VPpbz*I4y0qf@HiJ&uAx^M@wE)ATdd
zCZGc&%Rd)n7&h-Aa3Zs0S?B0*?{N#EWZZ|JmB8@=P8h;eEvpQ20L;|aMw?J&`(z{v
zt$)K*cwwt}cJG&L!iU@~Bn>JkVH|}QNgkS(#of*K>uGL&HV>G?DgMQ#^kkITY;NRd
zqnTfiYX>&)mZA>9dV!Cg^GMG#O3oNxUNQx9mXx$=#Fx0L%5{rjhDyI=Ei!spRPT_g
z@`u9n)=XpW<nLm%p^0#o6|Uq?d<iNFq;*E5Gu`l!TZsiwzjrqydz2Gge{jbP>D8Pr
zwF|b8C;PWv#gi1zfPAKle$r#$H~T|2Q32`>F-+M5*P!OJY%$x|O-JP9<sQtZ0Dbw(
zCcpcS6|QO_#Y?Dp5gst0ySkJXAtOlD(bk=mFq^c@5q4G6W|^-~RGwgck=xVGN(Km{
zn)}HFZ*4=$OTMhAK9>gUA@b{4YWO13Ttyjt2dJJx0cCUJJQ)c*3_h}kUlXYLWl3lA
zwO_j9?-k)pdT7JRE28PFQ^FRJKEhHa{~5BXLEP(a68<~F!iU!k%8{eI!5XRrD2yKN
zhnaMyh{G8i1x6^U2<Ng{h@_(}^iDQuU?pit4Z;%BM!siNCi7DF;U&d5Fm8Z!Rv9>1
znZKYVx|){(VXo2`*(?>tueg$bx9_UTI6FNl$e$X1%s{bcX=expoL}va)xLUsmOD-R
zoX-2Hbx?cKs(!?(6H=&OyZ>GeEW5NP|4rO|XU}p_Vu96<$6xB^G8&fN#^{991Ca3$
zT|n^Y=Y%xC#gk9udM$7KMd{Y{8Rzi7t(%mweKZi#e6BMl?UHFDE@=bFSoOvNw6A~U
zp^9?FA1~Pob&Xi3n`2pFqet<ufa{`wA^`p4JWZP9kOA(|0Yjkc9Ul!+cJ^JaoN-OD
z3&gfAt^ce90`By|AXOzF2r$d!;P>nchzRP$3i?Od4FZ#2yr{IcVHrAq;s@PJf1D7e
zP9O7aVIeufUeriN5U-<6HYveSVsFmw00^BE7MQ=YQF<ztuZlrx2eR1kQAKj8R#m-~
za>}z*{p|rTlZ>X#@xyGPvP7Mu1k=;BESiA5k;K0VxtTvQZ;=d_D1n8G&Bz}t^?z#d
z!@e#epQ<RAnN{NCedHvCtd>2XNH3aov66o%!chrGS-splg<({B^UwMTP)U&sEKHr9
ztFP_e-5xbur7$d>h#EmutORZnIwWG$TaObri+&qDOzpI$6Y&^uYB?2k8mUK-Nomdb
zF2puvMycW33*AKD>a^DUy2+V1O%>;S3)yFqNQ51&m&fY*pz5ZZkw+Qm<Ga!(ZI8?C
z0mJQR{MQ2|5#G(0=G-0kl_rLaNiT(uvM>78yIa7aUQVW*F5{;SJb!0zPeYY=Q#Y;~
zm_kWl0&x-&M|^$pPR(mJ%Y;v@{ONsUM@VMZ*1sp>)=69hjh}k*yb2nzCA}ReF^iWE
za4p&jSTl*N;5qqi=00A_^~y!4{(7y|6XGDjS4enSN0#5W7`1jD5S<ajMZ!Qfp@y*h
z4KrnT^_=r?;wRE7Y;+&gJTC$7{m{Lfoo;8jtGHex&<g=D-@i-@WN&@}{^<23NyN#@
zXx}A^ztuODtF4m<LUb+BN=E*FU}d*{7YhX17D(3H(U6c#!cIN)K)sUJ6{o?ipU)7g
zNoI5H8q4L*HVt3VZK|YE{a-FY6tQb(-^A3>biTWBOhq$YZe|I~BN$bb-0@LpaYmPe
zQ8O?2;@$_}OMkm6&-SDACZJ5SPRV1+8E_;Nz_%ae+4?K~>qw~DDq)2w_1rVEt*b#S
z#7^uwx6$5<gM*A~^1UYRixLd2frYC&)4gVnBdQxX_`R9VBz)1tu!C13wKXfh{c?Wq
z^{~XP?{Jgbdb6Cod<(a6qjTRvpZC$)H%^o036ome(O#gUH*bjKnKgaA^6@HjVS}7M
z{<JAzYqe*~F=CYTHqu0>AGJn{u)oTQ`hJA97kMm(Xq6XU6N6S<!Tl90`xYG$9*&bx
z9Xy=u?W^dPut%-hnN@|mXn?iOS7mu;%Fndo^wm?@A5wyV9|wCE`3@;>HxzyS>RmCW
z%yYfwtct&x5WXQ8x%x?Nyb?EouAP;yZDq|SCxD91?Km}4(YM{8FxGSpmg_sD=;vT^
zd~ILpOUs!#znQVIr($WaV>$UWliFVz$WU1G$y~~Rd)9lt*7MsIic);@`SWL2mi3E0
z#9CYb4{QqtG|RYM@d|m!sn1!YrmC$Tn2cK~U9D2X-8gUZ(hRR<U?(=RW#ElrUoQ=v
z9G_M|HY<HBCRssRoS@(aP!2wkbB_;D7YmXNra>O9dFA;cY!G12NWF)(znv;tl^ykK
z`_1B@B101^@m14TQ>j_kENYWyL@QK2p<?qg9p${Lg5p4+aKhfM>2owHnEdLvUOk^&
z2eJ3XGTP81IYPlM@mq4(=pU*8Zq=7SLgv0T6?VT;$Q5eWIK}mdBrY2KK+QH&QT==&
zo7^L;|JJdGof3#f#+1&dozAZ98lp>k8iv{#(Xgu|*ra8pmZ~;F)i7aj_sx?hjY8?u
z97W2N#Cdcz_K;`FrO)fbwC`De2`sK3K0WfN5Nll}v-_dt;ECoG6}l)rJx3(8sl(pj
zkI7-xezs}*k`O!P)_=R39Zlj_%mIdcVg2;^)X!<2B@#iYkQ8L!>L}E-vrjp57Hm>B
z?>NTsBUD=2+39I|0{hM<BOvskMma@u1mtX`XGWW68shTR{V|^OATLUts{Xi~Fzj^1
zsmzgc$2qyr$T}@(sKfDsvV~nWp<a7&Yr4}Vlp(E*i`ni$*9)nNB?nw|H<rj6(}3yQ
zI>V6{K@jqnTy_3ZsbBx+QuS+8C<Lh#19Pkj;@7;yAS)Kp%DuG$YdzbiJ2f95>-;2W
z&aEV>NeYG#nFXO^qRjfPuIgSs>V4c>Mt3c-6%~ZF_2WMe3;LJT9d6FWHz5Z^s>Q#f
z)xWM{6EigmeMfnxV!N|toJ9rHx2(YIltRewLN_jRqncV-Z{*Lrx>SgQXT|7LQcmyJ
z#3V80`s<B^VYj+x$+T=Zr;ukDwUg4p>8FaU{wX%nzK6{s`I8^tmpZ<kiL-B&$CG}9
zzdJbAQUi}HkbikVXb8@HUIvX`$(h)E)2I=jkW4vJc3_#nLDPLuHBv8qOqEqW-&WGP
zn#VVNg!lj<=i-aV#aJ^?e8-VrKVqA8xdVV_4f#6uU~WrC$o#fx$%~Q$*#rFDCyb3k
zitBG6Y8r`s_ALacDyP_D(xtoDHKjCu@>F(xXz!S_1j=4|-r2Z4_a~HiKA0<$HSpp@
zk*${X0-m6D?ORd&d+ZizJj+W?rB!m!d?R&BuWj_LLH~#fpucPM1rd@{9U`8Ft+A_%
z^eeK(;}Oo;&@pHWkYR?X8R=Rk@W|BbV?D^}{Bw@SIh-mGzP*yM4sJQ^O+ba5zS)d@
z*d|`*CnrOT;u|DK*cE9S-e&2U*3vM15GwBQ|IP6-VX}L&<2Tt{Dl2P|0pJ{~6BeFF
zkk9|yLf5HvnSaYP?aYI%F1s=$71*JE>T$yhagU=zCL?O=ADo8ZIX1S3JCeVaC->{@
zKiTI7p;+qTtp{(>iZGhnP;xW05t!Zm<Hy%QpGoIZ-?g8<h5$ZT-sQ~hwsg{?L~It>
z?(?QqLx6{>uxN~z95bNe*x-~wP-4&DE@)NVX~xPx_oh0)tXN=et&*xUXOosqRYVP3
z_fo$VN}(UZTKZn4OmKdmwd{Axy8pvWWM;_IMj@#?R;4(2fkmslvEf<OtSKdMANlcy
zdbY^~vT<06gj7RL_YJL&MW0lEpGxW)o6cdP&Jr7@nXpYK==pIP`khAutPS{i2~o5>
zmaB`<Gaux(q_Yzy`J8J|3J#cesx#l5OWDy`kBl40Z&;Y!h>h)a>%>TF2fQ*8r>By(
z?>o)#C_MEeUSpQwFS5%&St2*1;^!{bK^y$d`{=GuWw)KT*d`5enFQ3w!qEQui;VYe
zS{xUn4f%oeWGj%NywF<RO-CJc{t1Ob5blvZvD+T#%Q7K>k%Z(`fO*amV5y>2>=j47
z7twkYuikc*6i^Aav`AoXT^7d!im~-|gnRMBsUgE<)MRrqziTHh&cM7j%8~lBx=8k7
zQs8Q3;VQuc@ioa<dc;PO?ahwr756oHVJr7bH2&Ir=Ssd^F4ggz7yL1me34(dES{Ps
zjGLz&F)c&&Q6xwa8yy4Sgm@^B8iIM*iW*D8sessYJn#iB_om>FLPx(1Nr>IsoLsa)
zLcEB-vgJ0zh+$M5dqgr-?NH^qi2YxM&6-GKollGOEI_1N=CxcDpr&j~@=ptD2PX2r
ze^Q>k55(}SnLtX@vV*Qi6gAsmz0VD*AKJ*++j*_klE<S~7GxxTxXNcO<xE00uDQL!
zqeSO72%DcukFC8k4*;^{PVO5YVqF5I+mxT;{3h=z7Smd-JmUgbM`-+l;2Y(9%`NzT
zdz0hoR+@4Z_-N(g5$|~6W_Zu%!x`hs(}my@7ZZnvTcuy~m>R<(?26sl+Fg4kF2TH!
zD<aRzP04tGt1plPXAJ0q8PXgV$NJnMKG#3R;oSU*m6ngmv9-8Zjh9ls@2;yZKm`3h
zBwM>lq&d7*Tu`=|MV{)PAN1sFN5})Ik1;?$1_Al`LtO-`YztrrwFBDS3z)76_Dxm>
zEd?zww;gHmKW=R_8NG{F4@p)&X>=vayr|r4Vv7~{Zb~yN(RQJC%u@55M$(yt05}OP
z(S!6pL28J%4<1w&U_M59wL*RHxJ?8a{kp1mOn4il5V5pIq6MaEFIb89_N-uNl@Ts3
ziTbOyAOHhoIss+Dj?_fuJ9HU3*X0>>5$V_^C(GnwCC>H?NxagUG}#l1zXHSWJ2iPX
z>psr=;xBBSAW!_U!jrPB0KsGGt~FI(_kkt|q5#D4B2K>AUw)}yHUR9yGoq)aMJZH<
z*4CC(k$yFzJ3|7_cFoWhhQE=fx5K}CnpNYkrKBiHXScH=b%9cv`{nYsvXH$kTh}pQ
zB|smPUyyx^5<)PBF9Ik}=2%(FO${K>-lpv-QwdpHrqq8D#cEDIIg)ST7<@-&z*xrj
zZz2+JG-JetI60j}-y5`235GAy2T4~cq^i)dl%S|>W1HU8{@b10Bdo+Y-FYHY7p6~Q
z<Fr!q^w)h)0`$odvITGiRe@7aV-e|`%sZ+!Qz_LuhLp%7whx%)j=VCRY0}Dx1$M>#
z67lnyx@7<tk)odH(Shi{iDcS69rXoo-cbQFy|Hov8urVxo?xTp0Q2DnD2skW|6I$c
z^%L2~f7et1sf2UBhaa}mLdtV-uS^I&F(6^E*!>JlP9<U><&~lfRfD43i;Uy!>k9qT
zj%q&)f2rP5gRA_kwqa0pGB6<$Sr>y`B@CZz5Ak7UJp(#rfpdIsP|snD4~$Oer3*^Y
zuJ5b0s+y&*%wt^+g?eXO6&T*tG)Fdz3a7+s6G71i8ZIPcOJe7`?xxkB2PybN7LknV
z8%`DR5+D02DY+>e3_b_9eDTPJ_WQ!WqP&CaM9t7X(;%QNKf|wpFq3>y6MzRY<oK_n
zFQvD3q#bQ{Jz$4kvE@4NHv$8O`YB^-B08ie2O0)8D5EsZD2k@Fmq?O8PSAabAc2PT
z3p>nCh^x+NV?%_FRyKAb5GG{3(sSbE))M98<h@Aw$4+8K`~qOovJv1yosB)bls!j}
zj)}f<)VYa%#~|Kkbv(ZkoVDeRUPLm7p#QcoBB`Zh@OQuU5!h?qgQ8|xWV-z{0kzgy
zGqS!bscDccZWj{@CxG|zNW_nfrN&8-v0#At*PeU)#<^nrj`b<f+`_ki@Bu5i?+&A{
zrFA@#**NgdQc?A%Y2M#R6zGD)y(E5)<7EnH&!wvTf-FRuy;IN{n`q3yA7^Tuwkz#*
z<gGiDfsC+>w@JN_JtopQ>g48&Ek8f)`G36&xL)uh`}>yufrTXE4uBXqGAa0beM>+O
zzU`xqHZ{O&njFN-+{~C(YXY<&5jRCJK!bLuXl+br6Yt+q*S|J`r$OqERiShgwIQF;
zsuI5XF{BxZRQz8TO~cOHNQCdE09XkvaHatu0$|pkaL?HM_RA-RNcO>@%QeRxg_I}|
z*Kt`5PcN(Kg|gIDRj$e_{9X6w55EXYss6`=a4Myn+@pl9g(f5$;9#^P#l7768cV84
z{Jl`S^iqZ!i3_b+R(A%}3BfdWvxG}Y{Q_oq5n$^{WUnduw%O-H>WEtE0Bz1cLb14W
zLfor3829Wx+~-uj;mr-7yw@QRhwtCa=)u^-S)&D$M@Z+kH6HS?7NrP@v)>g25U0?S
zAa?y~8KY|E*MP%dyxX^#(___CE7YT{h>tG3oibK0F*9Fwr0>(K3xavGpEOQ~+ZERl
zK~Y}>leadcCzs!RPe=~2D<VNwH<y3dd)EN{*h{2?Rv<;L^!XN`s6v7kO_>1a<XAo1
zekC_+X}^3T_aBxPDqk#?T#X!Zri%R>56*f(M!ZLodDhHGKSb3dx8Xzr&_5o+Qj`CK
z2?PJwEWvs!dAbC<WV@IJyZ|rwZ}y8t6Y)9CRkHVwv@FF>4lNEhqG4R&NY7#7b(}j<
z1Mftw4~&b#F|TOV(O^14mtB|7i!dABnd|#_zx{gsYt2!)T%v}7>z&vXZkkz7f~Q9j
z**tx2>z{E(Uwf@x9yf%AFPdTjJ1Bn@haT2OY}-UMZ~+$oB_TP+HW0S9FGhk5=1*9k
zZ@ucBBKCnXg6SVZcfZe`U8je5<`H(Z;R4F?ZGpwD{`m8ZTwR;vO9Ox+RUx;1JP0)0
zXns@T@tYTA3?E4DEc)QH1nc9VQX`7N#YVFO(B=_(n4|5mr0EfBr_Tv!%Ib1{!1dFP
z5yp3p7b$&2PmlWlIQXxo??>@7HtGSMwT|P?vy#vLA_Fv<-8T7c?Eq+Uv_z+N;LUUV
zJsZ{`f*8yHW)=j9l+o!cL~UOPGd+<Ghmm#dGW|&aNep(ma6Qq})i5-}&eK+=QT$yU
zb3=PDfbzhb>@0w}xmH;f0L(WA^d)2dG||)JHn(4gcsvp;lA2_5B_rO`>psZ|hN<r!
zD>$5g3)=6pyz?-)Md|I1^ki?gMl)&6o7o>kE}9a<3sehm6KnfE)(E(tnO6aM1a+3U
zpR`wWnws9TR;CF2-9&^<)Dt(_n6V-1Hl%~2nnqog>hJ&AY$sLhKhVW3lFuYXG8HbR
zZ$cGlf-YBGHB;^t+sv2vESw2Rtb7%7hpF82SNy^XV?w?nGO`AII^FFDEwEFD7pFFG
zE})Z5a+VS~wZanr?Lr>Hn1|SCWjltJ`vzk_>37<UW;-2@1=#LOaFNT?CmaNv(ItDW
zy_e`((ZngMSO0p^U=TNJ{O>;RX-Lf56_}A0i{tV?0easO$4Ff@lq{ep#O^ZdCYhcH
zrxv~0g_{oLpd#IPfv(H=vvt^xI)SWg-TaloD9gBUvqs&Ew*cj;AlPQ_USr(q8cI37
z3B6}44SaTB^S0dj)E2+4#ck|8rf<*iZFVjCsxb12DaQd1UCcqn-oBAtHSOZbZHrzz
z;rj|h9$Rs8q}xmVyE+5LmeBM3eYI_sH;+a_fbR^3&719t4Q1=~kguti1ps%ys$^ux
z|C1^MZjB@U2UD|(*m4`-p4~)pk>zo~mAt&58RKZ12l`zAf%e-s!$^ooZLrY>e=-{E
z>U#vb8WxV<kLuD~UXZBZo^{3){|vb7(1dw@-k_qgN*!^m;~}jL=hkk^IWmnfH3h_>
zSxu4AJ6#{BG8@rcczqcJl-gkr?>-LT+nk?SjYqy(|BL5EJ{Jtyd+eu5D1WQOq7pbP
zeKPM9%ceJn07|?~N&j8k(#VPK<9zK;(>z_}S<isYy>g&ZDRIjYV-+C8Y_$n;SPEsm
zz8<La%d_o-q&7(me)0g4_ol6PT)C<RlkAjGxi&nT5#C%k(x8N7JZ#A}W45}HjqHkI
zk-XZ=WaRx8*`f5M)7s|Ol)`$mM|380$@NI*`4vAG1m^i4pma&fij7X*sMQ{h^}*)i
z@6LC)0#!`fmbJrY^zu<C7^j^!ZU3cBec;zSDrY$&di|N9H=7Q=yV0b-n<#gFw<m~(
z59o2?yfyrFxpmm&usN15<}g*-w}};YpUxFNJbI+iy`-BKyiObYx^?8JP%Ohr?C}-w
zGTfq~kJ@d@-(^036{t^MU&4eg?3X*Q3r+o15|Z|BvK<`B8M%Q2g)0VsBrCx+2xy?z
z`aXq3FFWukT@L$wtY#1=z7k9Z$W)Zz(Jl2T8;^FI!68DP+0f8x8k)tFpOBo2Bl#zY
zvBE5BHQ6SkZ>Bzd907cEu$#aF<ib-O3>A<f*mG0ZjgQNvbW;Z{-{|6v3Hjelz9%=S
zHfH<5*8qAx8{%(WsI-l5^;=THSPrB|+YL;kPDF>lliHrN<>sL0Mfi4jj8(N3AW!ZJ
zA@?ZIw%s<_>@5QzYUjZv2z@2AHK(BC=Cpen-je{1k)OKSJ3M*pZ)WPdZnMe(kUW{K
zyK3Ik@duYz@1i}sh&%jfaNx~G(gkgMv0&cZihTA~Ds|eE;gD0W@KGSf0chzM|BQy2
z!`9~VL!9?F4XVxy=)DFwkZfErRxF8g>o|6b0AJOJ6T=-^Rjprx=O5>-%)=ZsuYxqa
zZVPW;&zS$vzRA%(x|OYSU&kJe9DSqH&CMs-ZwFTyt(P_mDVMq#FA3<b=#_9AFI*j7
zICS`~w^C;V+w10ekwx&GsZpIwMLC|ODxowkO2ofnVntj$<*Xl4)vDLFz*3V$|Fbb1
zm=b8UxTg=)z}lKAFWQev*0|zH+U(lQzD?KD5Ffz2CRHEcnAlzd9*ThUS<vM};Ijkb
zRM_?a7+vtR6%QdftBtT=Wg*wmxidA*3b&mge?`xH#o97Cnby-Dd7X&c%jxI~BHd3w
z7+#p<U}&#@wSVKr(Dp|#cgfFO`$wMFvIuZ|r-!!ej7hS-lu&j+ptu%$=Su~bozBlb
zm-7y94I-vVD;iGPb-m8Irm06ldP(OvCSPy~+?y2~Z$GujH`~aY?65QmBBIQnRh~XG
zdqXPm((tY-7=v-wei14N$*qmS^(bp^s3xqyO5y*BRVL?Lp)p)LA!oNi?2$T3SigIc
zfsH(~Enar~!<K=c`thaFzkDZf!pLPKqt)g-*3^i*s8hoI*WP7As-lr~`^h*Jj_tD`
z$g}hW8jN``3qCA#y*({F-TKNN(o`1)W?bQt`&Z4B#N9C0F)H<s=p`o7Q`22aosk<y
zcLrFbD%3vgxYiVoP(UF3y<Jnb&c26PEbN)y)nLY1V(<NL2V^(SEKY~)M$AEiDFD;B
zmig=c{?0*^E>mM-s4!O@y>1VtUCZXLe6z3ZEZvFA2;N+g#k(?WZ6C8t>%UNsnvuL*
ztlFx@t6QGgyu*Adi$r_?Q~_yq@Un^ati|kTE2SRSbjY7{Xn_O=wCs1rR?R=<1#sB_
z?(~pZ=Iehq@>SpCuh8W(DH3ZCf1d^^biMx`Bjwwo=~O8Y1K79RV8wFrh2{o4bK#$1
zv4Ely9Bm@rgwNd3P=WU%jJ)*T<DEIB`$>r(jF}ORs9<~A-PBGPo^kOxaqRJ0up^M0
zUS;|fA7brtXESIs)>CfjYB}NG6f0W#iMaSAt!=%cT|2f^I`8dA-~1(owB{Di;%Gjn
z+^c66|3Dt@UPwvYJIkA^rMvPJkh_9VACA9UmEAE{EjRG;c}8Q#d7TwJeEwy?{*|8p
zN>W#1{lIa`FQ6-IU=WkB?qkPR^t2eW?7_t|YyO|x2gysUe@DmFr`r~_(OzbA^^)R1
zdi~(DE^&f1FX<d{%f^Y%1D;u4z5^5<Yss$5jO)ukHW^%uMx0F@zT8squQ%O<hSv0?
zpyK?c>#j1$kbcHa+@lLryl3C7&mh<zG)?Fu_Awg$n6k{i@5OUVq7IY7e6_AzSlbWS
zp!ooF7pU~!L<vEGMvfrTe4!*gCLRDC!9W|C_Z)5ToxGW7fS+C$gU_<&b2wH#_`r0I
zn4UNA44f82x|2Sna0_8O>S)UyvEv@^DMOmNDo$SSRO(0SDaCz}sxv`Y7Bx<@AUaxs
z79kL|8|r&ma1X@8u~KAxGc1zn<wNYVyEYWOGs9V%AYi^997}ZX`+S`n-t5LC0kq{t
zITv}Z<|BW@*#$}$XC59UE23UI(t*c7i$sjnovp1+T(7v3pu#N{AX(M7*GsW@e?Me5
zKZ)p|-!l`6M|Y!$aBQ{Lf?HTkozf@^)U04u!4J*6G{00N!9T9fTjwl>opLtxkq#I=
z0k{-Ua-QE_&-AXiwNZk<ohNg_)@A_7sn_&onPe_6-JH9j{b+3Chi^h$#C<e#R=)gW
zvd|kUykDl(yoU+t1tW}(2IYl_XDRR6FI0)-Z#Dv2T&CTXsrpkZnw~b;PeOx(bc;SD
zk0SNJ$<$<^;s&6E_-RE<<j6yQ{k|6SW^59)(2wQMipg!0;pTk-NyhPxHrtt0m3OhP
zh%WlBWuZWXhkA>Hc1=}zF(cqofbCY6)G$-eL6^S!k>aR=m{_<Ty!W8i&<f~21g;Q;
z$w=N`#+Ryka{X?uWG^1Ymw7!J>n3i-aqJ|ReH%MH&sL`|?JOT!+R*=(86#+sUZ>?N
z%oEb2%2FSx>2Pn&-k4O&yXg;aZqLf<CCKuPCUlS8HuJ95;HJAEp+!HW?cjxnnM}MJ
z>Ent1s_qrV9N4z=I}*i9wgY6~F15!C*+$yjjfPL9UJTQCBxCS$7qydA%wNBgS84cm
z&-U`Gnps)FMfsAS&idrx6Y|p%scyP>-p6x2UtHzWsPc8k+7I7(QiBcb9Ns&l2NFY<
z_s8>Zqkz^FJN&iAiH}@-$IV#OwTHdBCV5Cdpr@rhkJB{0<bwX5t<Pm=lf-ah<zr%Y
zOToq-7sIU&JF7w$7=}jHd7*x5fLaPnu*kfSM;&U8@*Z`OtN-0=-sZ-LQJodHP{VQ|
z*`L&22o^&E$Zu%H+c>=E*UP5%(Desn{^=v~x#4#9GJXTFkQuEtIQB_Wt}u&{_03=P
z8)kF{x>f$JlnAQkV8bvi+1oSpZJQH0&bKSs1EO3pUg|lbP;+iJFfWFK;-+iLUH=Ms
zu6dmhY<=+76GtX7;YMWoDw%9x)E)r0U%!4;16|Bbw>OtKAa<<QbJ1B#@kG}Le9cyQ
zy9?su?Ry=81v8x@+4S+i#Nh8Ou@fx0+y*iBm~|oZ>*A{2t@}LD+t|urtw(I4XwUhz
z#=i`Jw6ceqj>+fCRIulJ{^%AQ5T;b11kkz`ef|M9{V>^Q(8l0{buIQ~`*zU(Y2wV|
zq1^sB{s<RWNZq;J?2MWpQ)n!aidIXuD;g1s<XWaIF&Ks>`dKcfvR^eQl@c*_gKR%*
zW6Pa1)?{4KjCH2TF!#*(=l9=v&N<Kbe9w8F=RD`U&iC{Fu;A)zK;blf7dM;McZY@c
z+z8T5&ZZ>ex(GeuuRiHqTBD-EswyqDs$OsHG9cjxkI#9BaZ5QHmYv1RI95~b>u9qS
zXAzr*nyN(S@<EJF?a=s<;>(RLIhdKR9IA}Hsrx91fhlqk4Ov<H?Lc<@^pkkM68)j;
zHVw+pYTjNw#8U~iu)b?0BRN>NK!}|CeROfPKUe<;#g-A_09{i!4a2_#LK<Eg)k9|G
zkl1`tSx3NzdplQ^!pq^M)6zXwT{`bLuN~0Yq}vQF0b%F8l8IJ!UAM6S6@sTFN=1n(
z@HFS}D<cvi{HV{V`I`N`#nL{!?)_gf=Sf+Lf4A7<H~8OAay}hgn{cKb4!P}8-H}O*
z0a5Qv?u*zTFD8L(qxV<~_dUKxB_@=ERJsz0F|fuB$|)b$oZ4pBZjrfRJ`S{}U*&AJ
zaOg-N1+Gt<?ang{P+ALkQ>8y@q_S=}?Bk&txpo|Ebbau$X<U=_%-AvAIvaXz`h4j=
zv&D+^?Pq-<1IZiYfAUWGehOnKvm(0Q?Xy2Ib9oXwn|kaPa{rON^Hft-KWmJP(3Q6y
z3GlA`e5*4Wb;X664%19C$nnH(5QeYcvfplqcALOXJ;DdYF7|d-`n9_$`F*Zs6&9-V
zDflMv-M8Fux$L1BYJy{zQdWDBcykhSu<Ny<Va{R&n7exDBSG4?7XOQGQ8VgI*%eB#
z%q5+j)7=!$)*7!Vy5l|DvSBX>5KG^33Y1xC9qQ0yxi>l_zb^mf=sboRn-$CX;lBFL
zm;W(VP9~buIQ5NQANnG2sySx08CgzoEH|>=n@hN8r-6^P90_<@>HNRUjLpeDxO;iC
zk;409mj^=8p11^Kn$E*xEq)J5n{O7D8r3Q{vGUIU__Mcp!VibFu-M|W%l0Ac`oHJv
zMbDc~Eoh@J&XqMXLk>3Pua0Hz9`sM!9&eXq-1k%`Mcu(-H|LLwm&@}x`#bJlI(2O0
zq?Gflp(DH;m-Nf}OUhbma79{+I(sG5>#<&!qPIrWc8SU2Hxzw*|9^B^>Ry6nT0-|j
zyROEYcO%g6RUbrR;0fTYGsNdbH%vL3w>gDC`q&Q8zW^CJ^Hu4~MOoM0cx-KSHe4!f
zrY*skV)l$teRNFQn;uSeqR3h&hw+A)xHm<#{EJH)N4E37G%!8hEcv_LmooaxHzJRT
zrt22F8|9fKSXuOQtQK^!wKs_MpQm$Z@v&p-=gU(aqWb&BucVpqn`!M7w0JCkV)QlI
zca`Nco<mA%zMv#H(C-li&y4dXKeA=muiXo;Vnx5F?yT*h7{l;gv4rsxoB3aTSsyy9
zT*FoMx`-dxD$0m0$Gjf-T!SVfRJCz+p<l_Ef?fua#F2ieIn=5Ip=^-DigR9fb>5Pr
zJsr=Qp2^CcJ~dzEw6DX~FU(=R^O7uM__{KNJl~}9^xAd=H^My+f!MFxQxRZ6+0!qg
zHc^Fo^M1(`$%I#VJKiMVg1w3?4!a?{oh3qH<X7ARgQ@4qvDrwl=rw`N-J;eQ9}$5f
zNm{6V<6Td_*WG9Lxtir{N9Go^q<v$zS?EbXPG?hm8?tOSE0slhQ6?rZ{jZNwW{!?Z
zXZ{s`O%{?&K^8BUrCbi(CE2Q+-Ow0KmBye(q)c<N|8}~%`^)hQ_B37K7Sx;R7(r_I
z19sqikj1+PDHxRKL)%BKya_O0+Olv{o4l<)In`4q)Uuf(ZZc>|1{4=0M%Q9Xqf)2S
z%*#HrXCK-*qx%it@;g0w=a(<~=1uj%Ko1JS3@D59f7Vdnj@Vp~AD5R5f28$|^2nyJ
zrZOkFkqjg!-0WCx_FciW9I2iI5IM!9Ay)&hA%9T2P^sP}Se5wQ|4KSHqo+jFkEFdD
zvfPdS7<`B<$#ekvgR_Ad7}RM!*3quL*H;h_G!hILBpK|e0V&kIY1y#bT#9F2!1HU9
z@Wb0;P{FT1xGyrXk1HE&iBe)%W5=JV{^km2!4MWy*IZm6S9%ho#IRzc;b?|R!#R+x
zhQHI5tMB-#8Qv+${O1U1?TjF^B;0C&ob^rP640e#OzP`2n#!Y{gq?+g+rl4cSp*H#
z*pg2$eg-c~+_T^WP!s6FF$%pBg6CnLS9d1D9_(mpFaVE4yif+br7cgwEydk{V4Qd%
z%E!HZ6Hagv;DVrMZlrUy1E!|q@dAzyM8r4Ha4l6TttZa`Dhd=An5a#GYYLM~Y81q8
zfEfg-xfxJy|Eeh~OyhovUw&e|Qy0J<3ZBcK))26kz^__2p3@<0;|9GTqpcB{Xb2EO
z5F{yx*p>jcLk{wmsnGL1fGz@r>p=&{m+inYqQEMYd9@I8C`$khf^vFcZMY?&Nj+t>
z^-PSz9%(^yP=5y~2;3=9RHmMbNEZ>>XY7sVY!SfD5?FPRkzpymU$K<o@1~!=FYIBQ
z>$=s(%;RYl4PkBnQAD-#r2H=7#n&N3JSPhPc_663BZl$u;2%=Le1(b$r7gm9xUk@N
zImwx(1)*<}qBBiBJE^`8%hYh9y6|2#n@m9iMd82$sI7P==54f^a10@X_F00%kT$Tt
zLw|xGOGwxP5fb)EO+;wTe3#JsI5FYyK|A9G?FGz{|GP0RJam0AH7O~{o6sHcgj45p
zrOZSX*3p`{{3$Wht0Dq~!Qr*G0{6%@_74@CDV|oUbHq=b`9h%mL|Ryxwzl?A<eQaA
W+?eMmNeifCkkxs+b7g0)5&i{xnK&~5

literal 0
HcmV?d00001

diff --git a/filcnaplo/lib/database/init.dart b/filcnaplo/lib/database/init.dart
index 8c01136..1519f0a 100644
--- a/filcnaplo/lib/database/init.dart
+++ b/filcnaplo/lib/database/init.dart
@@ -46,8 +46,10 @@ const userDataDB = DatabaseStruct("user_data", {
   "renamed_teachers": String,
   // "subject_lesson_count": String, // non kreta data
   "last_seen_grade": int,
-  // goal plans // non kreta data
+  // goal planning // non kreta data
   "goal_plans": String,
+  "goal_averages": String,
+  "goal_befores": String,
 });
 
 Future<void> createTable(Database db, DatabaseStruct struct) =>
@@ -99,8 +101,10 @@ Future<Database> initDB(DatabaseProvider database) async {
       "renamed_teachers": "{}",
       // "subject_lesson_count": "{}", // non kreta data
       "last_seen_grade": 0,
-      // goal plans // non kreta data
+      // goal planning // non kreta data
       "goal_plans": "{}",
+      "goal_averages": "{}",
+      "goal_befores": "{}",
     });
   } catch (error) {
     print("ERROR: migrateDB: $error");
diff --git a/filcnaplo/lib/database/query.dart b/filcnaplo/lib/database/query.dart
index 4706615..b3a6de8 100644
--- a/filcnaplo/lib/database/query.dart
+++ b/filcnaplo/lib/database/query.dart
@@ -192,6 +192,7 @@ class UserDatabaseQuery {
     return lastSeen;
   }
 
+  // renamed things
   Future<Map<String, String>> renamedSubjects({required String userId}) async {
     List<Map> userData =
         await db.query("user_data", where: "id = ?", whereArgs: [userId]);
@@ -214,14 +215,36 @@ class UserDatabaseQuery {
         .map((key, value) => MapEntry(key.toString(), value.toString()));
   }
 
+  // goal planner
   Future<Map<String, String>> subjectGoalPlans({required String userId}) async {
     List<Map> userData =
         await db.query("user_data", where: "id = ?", whereArgs: [userId]);
     if (userData.isEmpty) return {};
-    String? goalPlansJson =
-        userData.elementAt(0)["goal_plans"] as String?;
+    String? goalPlansJson = userData.elementAt(0)["goal_plans"] as String?;
     if (goalPlansJson == null) return {};
     return (jsonDecode(goalPlansJson) as Map)
         .map((key, value) => MapEntry(key.toString(), value.toString()));
   }
+
+  Future<Map<String, String>> subjectGoalAverages(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalAvgsJson = userData.elementAt(0)["goal_averages"] as String?;
+    if (goalAvgsJson == null) return {};
+    return (jsonDecode(goalAvgsJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
+
+  Future<Map<String, String>> subjectGoalBefores(
+      {required String userId}) async {
+    List<Map> userData =
+        await db.query("user_data", where: "id = ?", whereArgs: [userId]);
+    if (userData.isEmpty) return {};
+    String? goalBeforesJson = userData.elementAt(0)["goal_befores"] as String?;
+    if (goalBeforesJson == null) return {};
+    return (jsonDecode(goalBeforesJson) as Map)
+        .map((key, value) => MapEntry(key.toString(), value.toString()));
+  }
 }
diff --git a/filcnaplo/lib/database/store.dart b/filcnaplo/lib/database/store.dart
index 1319286..4083bec 100644
--- a/filcnaplo/lib/database/store.dart
+++ b/filcnaplo/lib/database/store.dart
@@ -127,6 +127,7 @@ class UserDatabaseStore {
         where: "id = ?", whereArgs: [userId]);
   }
 
+  // renamed things
   Future<void> storeRenamedSubjects(Map<String, String> subjects,
       {required String userId}) async {
     String renamedSubjectsJson = jsonEncode(subjects);
@@ -141,10 +142,25 @@ class UserDatabaseStore {
         where: "id = ?", whereArgs: [userId]);
   }
 
+  // goal planner
   Future<void> storeSubjectGoalPlans(Map<String, String> plans,
       {required String userId}) async {
     String goalPlansJson = jsonEncode(plans);
     await db.update("user_data", {"goal_plans": goalPlansJson},
         where: "id = ?", whereArgs: [userId]);
   }
+
+  Future<void> storeSubjectGoalAverages(Map<String, String> avgs,
+      {required String userId}) async {
+    String goalAvgsJson = jsonEncode(avgs);
+    await db.update("user_data", {"goal_averages": goalAvgsJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
+
+  Future<void> storeSubjectGoalBefores(Map<String, String> befores,
+      {required String userId}) async {
+    String goalBeforesJson = jsonEncode(befores);
+    await db.update("user_data", {"goal_befores": goalBeforesJson},
+        where: "id = ?", whereArgs: [userId]);
+  }
 }
diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml
index be6afaa..751aa3e 100644
--- a/filcnaplo/pubspec.yaml
+++ b/filcnaplo/pubspec.yaml
@@ -86,6 +86,7 @@ flutter:
     - assets/icons/ic_splash.png
     - assets/animations/
     - assets/images/
+    - assets/images/subject_covers/
 
   fonts:
     - family: FilcIcons
diff --git a/filcnaplo_mobile_ui/lib/common/round_border_icon.dart b/filcnaplo_mobile_ui/lib/common/round_border_icon.dart
index f8c9220..ac1fdf4 100644
--- a/filcnaplo_mobile_ui/lib/common/round_border_icon.dart
+++ b/filcnaplo_mobile_ui/lib/common/round_border_icon.dart
@@ -3,12 +3,14 @@ import 'package:flutter/material.dart';
 class RoundBorderIcon extends StatelessWidget {
   final Color color;
   final double width;
+  final double padding;
   final Widget icon;
 
   const RoundBorderIcon(
       {Key? key,
       this.color = Colors.black,
       this.width = 1.5,
+      this.padding = 5.0,
       required this.icon})
       : super(key: key);
 
@@ -20,7 +22,7 @@ class RoundBorderIcon extends StatelessWidget {
         borderRadius: BorderRadius.circular(50.0),
       ),
       child: Padding(
-        padding: const EdgeInsets.all(5.0),
+        padding: EdgeInsets.all(padding),
         child: icon,
       ),
     );
diff --git a/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart b/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart
index 29217c8..0c0c152 100755
--- a/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart
+++ b/filcnaplo_mobile_ui/lib/pages/grades/grade_subject_view.dart
@@ -26,6 +26,7 @@ import 'package:filcnaplo_mobile_ui/pages/grades/subject_grades_container.dart';
 import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_planner_screen.dart';
 import 'package:filcnaplo_premium/models/premium_scopes.dart';
 import 'package:filcnaplo_premium/providers/premium_provider.dart';
+import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_state_screen.dart';
 import 'package:filcnaplo_premium/ui/mobile/premium/upsell.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
@@ -292,12 +293,11 @@ class _GradeSubjectViewState extends State<GradeSubjectView> {
                       onTap: () {
                         Navigator.of(context).push(CupertinoPageRoute(
                             builder: (context) =>
-                                GoalPlannerScreen(subject: widget.subject)));
+                                GoalStateScreen(subject: widget.subject)));
                       },
                       child: Container(
                         width: 54.0,
-                        padding: const EdgeInsets.symmetric(
-                            horizontal: 5.0, vertical: 8.0),
+                        padding: const EdgeInsets.symmetric(vertical: 8.0),
                         decoration: BoxDecoration(
                           borderRadius: BorderRadius.circular(45.0),
                           color: Theme.of(context)
diff --git a/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner_screen.dart b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner_screen.dart
index 3db2e2d..4cf8acf 100644
--- a/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner_screen.dart
+++ b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_planner_screen.dart
@@ -65,6 +65,15 @@ class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
     return await dbProvider.userQuery.subjectGoalPlans(userId: user.id!);
   }
 
+  Future<Map<String, String>> fetchGoalAverages() async {
+    return await dbProvider.userQuery.subjectGoalAverages(userId: user.id!);
+  }
+
+  // haha bees lol
+  Future<Map<String, String>> fetchGoalBees() async {
+    return await dbProvider.userQuery.subjectGoalBefores(userId: user.id!);
+  }
+
   PlanResult getResult() {
     final currentAvg = GoalPlannerHelper.averageEvals(grades);
 
@@ -148,7 +157,11 @@ class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
       body: SafeArea(
         child: ListView(
           padding: const EdgeInsets.only(
-              left: 22.0, right: 22.0, top: 5.0, bottom: 220.0),
+            top: 5.0,
+            bottom: 220.0,
+            right: 15.0,
+            left: 2.0,
+          ),
           children: [
             // Row(
             //   mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -215,91 +228,99 @@ class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
               ],
             ),
             const SizedBox(height: 12.0),
-            Text(
-              "set_a_goal".i18n,
-              style: const TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 20.0,
+            Padding(
+              padding: const EdgeInsets.only(left: 22.0, right: 22.0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Text(
+                    "set_a_goal".i18n,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 20.0,
+                    ),
+                  ),
+                  const SizedBox(height: 4.0),
+                  Text(
+                    goalValue.toString(),
+                    style: TextStyle(
+                      fontWeight: FontWeight.w900,
+                      fontSize: 48.0,
+                      color: gradeColor(goalValue.round(), settingsProvider),
+                    ),
+                  ),
+                  // Column(
+                  //   mainAxisAlignment: MainAxisAlignment.center,
+                  //   children: [
+                  //     Text(
+                  //       "select_subject".i18n,
+                  //       style: const TextStyle(
+                  //         fontWeight: FontWeight.bold,
+                  //         fontSize: 20.0,
+                  //       ),
+                  //     ),
+                  //     const SizedBox(height: 4.0),
+                  //     Column(
+                  //       children: [
+                  //         Icon(
+                  //           SubjectIcon.resolveVariant(
+                  //             context: context,
+                  //             subject: widget.subject,
+                  //           ),
+                  //           size: 48.0,
+                  //         ),
+                  //         Text(
+                  //           (widget.subject.isRenamed
+                  //                   ? widget.subject.renamedTo
+                  //                   : widget.subject.name) ??
+                  //               '',
+                  //           style: const TextStyle(
+                  //             fontSize: 17.0,
+                  //             fontWeight: FontWeight.w500,
+                  //           ),
+                  //         )
+                  //       ],
+                  //     )
+                  //   ],
+                  // )
+                  const SizedBox(height: 24.0),
+                  Text(
+                    "pick_route".i18n,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 20.0,
+                    ),
+                  ),
+                  const SizedBox(height: 12.0),
+                  if (recommended != null)
+                    RouteOption(
+                      plan: recommended!,
+                      mark: RouteMark.recommended,
+                      selected: selectedRoute == recommended!,
+                      onSelected: () => setState(() {
+                        selectedRoute = recommended;
+                      }),
+                    ),
+                  if (fastest != null && fastest != recommended)
+                    RouteOption(
+                      plan: fastest!,
+                      mark: RouteMark.fastest,
+                      selected: selectedRoute == fastest!,
+                      onSelected: () => setState(() {
+                        selectedRoute = fastest;
+                      }),
+                    ),
+                  ...otherPlans.map((e) => RouteOption(
+                        plan: e,
+                        selected: selectedRoute == e,
+                        onSelected: () => setState(() {
+                          selectedRoute = e;
+                        }),
+                      )),
+                  if (result != PlanResult.available) Text(result.name),
+                ],
               ),
             ),
-            const SizedBox(height: 4.0),
-            Text(
-              goalValue.toString(),
-              style: TextStyle(
-                fontWeight: FontWeight.w900,
-                fontSize: 48.0,
-                color: gradeColor(goalValue.round(), settingsProvider),
-              ),
-            ),
-            // Column(
-            //   mainAxisAlignment: MainAxisAlignment.center,
-            //   children: [
-            //     Text(
-            //       "select_subject".i18n,
-            //       style: const TextStyle(
-            //         fontWeight: FontWeight.bold,
-            //         fontSize: 20.0,
-            //       ),
-            //     ),
-            //     const SizedBox(height: 4.0),
-            //     Column(
-            //       children: [
-            //         Icon(
-            //           SubjectIcon.resolveVariant(
-            //             context: context,
-            //             subject: widget.subject,
-            //           ),
-            //           size: 48.0,
-            //         ),
-            //         Text(
-            //           (widget.subject.isRenamed
-            //                   ? widget.subject.renamedTo
-            //                   : widget.subject.name) ??
-            //               '',
-            //           style: const TextStyle(
-            //             fontSize: 17.0,
-            //             fontWeight: FontWeight.w500,
-            //           ),
-            //         )
-            //       ],
-            //     )
-            //   ],
-            // )
-            const SizedBox(height: 24.0),
-            Text(
-              "pick_route".i18n,
-              style: const TextStyle(
-                fontWeight: FontWeight.bold,
-                fontSize: 20.0,
-              ),
-            ),
-            const SizedBox(height: 12.0),
-            if (recommended != null)
-              RouteOption(
-                plan: recommended!,
-                mark: RouteMark.recommended,
-                selected: selectedRoute == recommended!,
-                onSelected: () => setState(() {
-                  selectedRoute = recommended;
-                }),
-              ),
-            if (fastest != null && fastest != recommended)
-              RouteOption(
-                plan: fastest!,
-                mark: RouteMark.fastest,
-                selected: selectedRoute == fastest!,
-                onSelected: () => setState(() {
-                  selectedRoute = fastest;
-                }),
-              ),
-            ...otherPlans.map((e) => RouteOption(
-                  plan: e,
-                  selected: selectedRoute == e,
-                  onSelected: () => setState(() {
-                    selectedRoute = e;
-                  }),
-                )),
-            if (result != PlanResult.available) Text(result.name),
           ],
         ),
       ),
@@ -346,12 +367,25 @@ class _GoalPlannerScreenState extends State<GoalPlannerScreen> {
                           }
 
                           final goalPlans = await fetchGoalPlans();
+                          final goalAvgs = await fetchGoalAverages();
+                          final goalBeforeGrades = await fetchGoalBees();
+
                           goalPlans[widget.subject.id] =
                               selectedRoute!.dbString;
+                          goalAvgs[widget.subject.id] =
+                              goalValue.toStringAsFixed(1);
+                          goalBeforeGrades[widget.subject.id] =
+                              avg.toStringAsFixed(1);
 
                           await dbProvider.userStore.storeSubjectGoalPlans(
                               goalPlans,
                               userId: user.id!);
+                          await dbProvider.userStore.storeSubjectGoalAverages(
+                              goalAvgs,
+                              userId: user.id!);
+                          await dbProvider.userStore.storeSubjectGoalBefores(
+                              goalBeforeGrades,
+                              userId: user.id!);
 
                           Navigator.of(context).pop();
                         },
diff --git a/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.dart b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.dart
new file mode 100644
index 0000000..0397160
--- /dev/null
+++ b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.dart
@@ -0,0 +1,229 @@
+import 'package:filcnaplo/api/providers/database_provider.dart';
+import 'package:filcnaplo/api/providers/user_provider.dart';
+import 'package:filcnaplo/helpers/subject.dart';
+import 'package:filcnaplo_kreta_api/models/subject.dart';
+import 'package:filcnaplo_mobile_ui/common/average_display.dart';
+import 'package:filcnaplo_mobile_ui/common/panel/panel.dart';
+import 'package:filcnaplo_mobile_ui/common/round_border_icon.dart';
+import 'package:filcnaplo_premium/ui/mobile/goal_planner/goal_state_screen.i18n.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class GoalStateScreen extends StatefulWidget {
+  final Subject subject;
+
+  const GoalStateScreen({Key? key, required this.subject}) : super(key: key);
+
+  @override
+  State<GoalStateScreen> createState() => _GoalStateScreenState();
+}
+
+class _GoalStateScreenState extends State<GoalStateScreen> {
+  late UserProvider user;
+  late DatabaseProvider db;
+
+  double goalAvg = 0.0;
+  double beforeAvg = 0.0;
+  double avgDifference = 0;
+
+  @override
+  void initState() {
+    super.initState();
+    user = Provider.of<UserProvider>(context, listen: false);
+    db = Provider.of<DatabaseProvider>(context, listen: false);
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      fetchGoalAverages();
+    });
+  }
+
+  void fetchGoalAverages() async {
+    var goalAvgRes = await db.userQuery.subjectGoalAverages(userId: user.id!);
+    var beforeAvgRes = await db.userQuery.subjectGoalBefores(userId: user.id!);
+
+    String? goalAvgStr = goalAvgRes[widget.subject.id];
+    String? beforeAvgStr = beforeAvgRes[widget.subject.id];
+    goalAvg = double.parse(goalAvgStr ?? '0.0');
+    beforeAvg = double.parse(beforeAvgStr ?? '0.0');
+
+    avgDifference = ((goalAvg - beforeAvg) / beforeAvg.abs()) * 100;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        decoration: const BoxDecoration(
+          image: DecorationImage(
+            image: AssetImage('assets/images/subject_covers/math_light.png'),
+            fit: BoxFit.fitWidth,
+            alignment: Alignment.topCenter,
+          ),
+        ),
+        child: Container(
+          decoration: BoxDecoration(
+            gradient: LinearGradient(
+              begin: Alignment.topCenter,
+              end: Alignment.bottomCenter,
+              colors: [
+                Theme.of(context).scaffoldBackgroundColor.withOpacity(0.2),
+                Theme.of(context).scaffoldBackgroundColor,
+              ],
+              stops: const [
+                0.1,
+                0.22,
+              ],
+            ),
+          ),
+          child: Padding(
+            padding: const EdgeInsets.only(top: 10.0, left: 2.0, right: 2.0),
+            child: ListView(
+              children: [
+                const Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  crossAxisAlignment: CrossAxisAlignment.center,
+                  children: [
+                    BackButton(),
+                  ],
+                ),
+                const SizedBox(height: 22.0),
+                Column(
+                  children: [
+                    RoundBorderIcon(
+                      icon: Icon(
+                        SubjectIcon.resolveVariant(
+                          context: context,
+                          subject: widget.subject,
+                        ),
+                        size: 26.0,
+                        weight: 2.5,
+                      ),
+                      padding: 8.0,
+                      width: 2.5,
+                    ),
+                    const SizedBox(
+                      height: 10.0,
+                    ),
+                    Text(
+                      (widget.subject.isRenamed
+                              ? widget.subject.renamedTo
+                              : widget.subject.name) ??
+                          'goal_planner_title'.i18n,
+                      style: const TextStyle(
+                        fontSize: 30.0,
+                        fontWeight: FontWeight.w700,
+                      ),
+                    ),
+                    Text(
+                      'almost_there'.i18n,
+                      style: const TextStyle(
+                        fontSize: 22.0,
+                        fontWeight: FontWeight.w400,
+                        height: 1.0,
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 28.0),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 24.0),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      Row(
+                        children: [
+                          Text(
+                            'started_with'.i18n,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.w700,
+                              fontSize: 20.0,
+                            ),
+                          ),
+                        ],
+                      ),
+                      Row(
+                        children: [
+                          Text(
+                            'current'.i18n,
+                            style: const TextStyle(
+                              fontWeight: FontWeight.w700,
+                              fontSize: 20.0,
+                            ),
+                          ),
+                        ],
+                      ),
+                    ],
+                  ),
+                ),
+                const SizedBox(height: 10.0),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 12.0),
+                  child: Panel(
+                    padding: const EdgeInsets.all(18.0),
+                    child: Column(
+                      children: [
+                        Row(
+                          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                          children: [
+                            Text(
+                              'your_goal'.i18n,
+                              style: const TextStyle(
+                                fontSize: 23.0,
+                                fontWeight: FontWeight.w700,
+                              ),
+                            ),
+                            RawMaterialButton(
+                              onPressed: () async {},
+                              fillColor: Colors.black,
+                              shape: const StadiumBorder(),
+                              padding:
+                                  const EdgeInsets.symmetric(horizontal: 18.0),
+                              child: Text(
+                                "change_it".i18n,
+                                style: const TextStyle(
+                                  height: 1.0,
+                                  color: Colors.white,
+                                  fontSize: 14.0,
+                                  fontWeight: FontWeight.w600,
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                        Row(
+                          children: [
+                            Text(
+                              goalAvg.toString(),
+                              style: const TextStyle(
+                                height: 1.1,
+                                fontSize: 42.0,
+                                fontWeight: FontWeight.w800,
+                              ),
+                            ),
+                            Center(
+                              child: Container(
+                                width: 54.0,
+                                padding:
+                                    const EdgeInsets.symmetric(vertical: 8.0),
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(45.0),
+                                  color: Colors.limeAccent.shade700
+                                      .withOpacity(.15),
+                                ),
+                                child: Text(avgDifference.toString()),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ],
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
diff --git a/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.i18n.dart b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.i18n.dart
new file mode 100644
index 0000000..90fabd5
--- /dev/null
+++ b/filcnaplo_premium/lib/ui/mobile/goal_planner/goal_state_screen.i18n.dart
@@ -0,0 +1,39 @@
+import 'package:i18n_extension/i18n_extension.dart';
+
+extension Localization on String {
+  static final _t = Translations.byLocale("hu_hu") +
+      {
+        "en_en": {
+          "goal_planner_title": "Goal Planning",
+          "almost_there": "Almost there! Keep going!",
+          "select_subject": "Subject",
+          "pick_route": "Pick a Route",
+          "track_it": "Track it!",
+          "recommended": "Recommended",
+          "fastest": "Fastest",
+        },
+        "hu_hu": {
+          "goal_planner_title": "Cél követés",
+          "set_a_goal": "Kitűzött cél",
+          "select_subject": "Tantárgy",
+          "pick_route": "Válassz egy utat",
+          "track_it": "Követés!",
+          "recommended": "Ajánlott",
+          "fastest": "Leggyorsabb",
+        },
+        "de_de": {
+          "goal_planner_title": "Zielplanung",
+          "set_a_goal": "Dein Ziel",
+          "select_subject": "Thema",
+          "pick_route": "Wähle einen Weg",
+          "track_it": "Verfolge es!",
+          "recommended": "Empfohlen",
+          "fastest": "Am schnellsten",
+        },
+      };
+
+  String get i18n => localize(this, _t);
+  String fill(List<Object> params) => localizeFill(this, params);
+  String plural(int value) => localizePlural(value, this, _t);
+  String version(Object modifier) => localizeVersion(modifier, this, _t);
+}