From daf62f222ca7c0e145666c9e5839912b161acdb4 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Tue, 3 Dec 2019 21:16:35 -0500
Subject: [PATCH] Continuing work on download functionality

---
 .../executionHistory/executionHistory.bin     | Bin 4579015 -> 4579015 bytes
 .../executionHistory/executionHistory.lock    | Bin 17 -> 17 bytes
 .gradle/5.4.1/fileHashes/fileHashes.bin       | Bin 455341 -> 455341 bytes
 .gradle/5.4.1/fileHashes/fileHashes.lock      | Bin 17 -> 17 bytes
 .../5.4.1/fileHashes/resourceHashesCache.bin  | Bin 66643 -> 66915 bytes
 .gradle/5.4.1/javaCompile/classAnalysis.bin   | Bin 3270848 -> 3277114 bytes
 .gradle/5.4.1/javaCompile/jarAnalysis.bin     | Bin 1696998 -> 1718811 bytes
 .gradle/5.4.1/javaCompile/javaCompile.lock    | Bin 17 -> 17 bytes
 .idea/workspace.xml                           | 539 +++++++++---------
 app/src/main/cpp/Demo.cpp                     |  46 +-
 app/src/main/cpp/Demo.h                       |  30 +
 app/src/main/cpp/manager/DirectoryManager.h   | 100 +++-
 app/src/main/cpp/model/Song.h                 |  57 +-
 app/src/main/cpp/repository/SongRepository.h  |   2 +
 .../main/java/com/example/mear/models/Song.kt |   3 +-
 .../mear/repositories/TrackRepository.kt      |   9 +-
 16 files changed, 460 insertions(+), 326 deletions(-)

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.bin b/.gradle/5.4.1/executionHistory/executionHistory.bin
index 5533df8a9c53b411d422277be6dda817724fe697..d1b1b3224f0c90fdaeb8d9c77d5d65a9d7afd00b 100644
GIT binary patch
delta 3341
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

delta 3240
zcmd^>iBps37RLDk1Or*#1PKVq$0C9(4GCK;vW2QZK@DQXjV)9WSp*jpdl7JpC_#bR
zqo9Sj+_oSp2)@85f>_Yo%5qU#SMYk>Mbx(Hc-7uls570!JN*N0W_~l7e9JjG=lP!J
z>pBUHE<*lBY9nK#VS|xG1a;9OI|i#?trQs%jImP0oac>BBrc(Av!+B=yDv<weS9hu
z7tCV&vQZsJ-Z8$&u6f#wSLYn3#O(sbN@FjO7D+;(w?x9kd9lo^E=bw9vwdGFr`zT0
zgRA~scXvI$Y3X83q0OC?lk8FbrP}&SsZ++j=m(jd%UakG!RLagkXekHqc^;2+r1@h
z;Kgsw^6&1cK&Ik&0XoDB1?2<L0i;o%xRQ{z$+@_LKE3jC^Kp>vlPm>P$!<jRChl&3
zxyeQoUfg``);zye5QQac0Uc)XpsI+u3GL_kY)U$pyw1{qR(GE83xp_33ok6)&i=&&
zLEwz@OIA?M_?ycYti`?!>eQV~f(cIDIcDl5bf)RdqQJP4pGtYNo=h>i(hAykk61`(
z<5~j>6&hpzG}e3$uOYy*s%+5sfyJv?USHa{gRI0g4ia)$-k|Z2y~G}0u-ZOC)y^9w
zLC%`}gVXKeI6cX`Aj-`>7lQxAodEHl$;#2}6+fPzW3ab$xNuF_Co!G@&_0)y38<Ro
z0@;gYm5BOfUSd*X`4W|D*uIHNA{XGqt@2<BnMR~c&h6dO+V@TQZ8|DkiR-q>6%>kG
zduF!zyeBhP=f3tSyzrnJ3O36%?`9%^w>_*9R2924<%PA;XZ-s!=GdjiRzenw{ITE~
zmdEj<tPYmNv(x@(3O7iMFSYE?^zR<9rVNbtHbA`8)KWd%%)-OXrXh36W`@}@CKW&x
zGK<8O$c(p5Fyz#b9eyy`WWk_|S(|%iJ5>ekS>kc{a)nvADPr`iil@4VC@rtODI9RR
zDukPULUT}R*<!d>Wi}u3kFt39hrgRO#h{Y<^S^g?yXRDNhPd~1?0*e>t-~a~{?D=+
zGZhZ}-OMZc|46kKx~ioNC^a8SESa-#Zy7t<P<_3ejjxw;l6j*~IHRI0D#{JNjTTu^
z(A#ckt3F%9!Dnl@wU+u4@B5iEDslX}gL};w>8Lvb_=mWe(Dpf#15y>60}1g=Ge{WZ
z8pGKySO}N?gL~0ZU+uCTVhv>G*l<4}^i|?a2;Rna1C%T?))P8B%@^lFLM_YD+)z*M
z4Cvb=FM22Jv3y<4GeE16e?aO~HR->qm??s`$E531eWdH0JKT>AQP0;|87)p-z7^Un
z2c9i_XpZS;+_?;N{^`CkN7f&<epC5mk;SCdgP=HUssQD4ZYi2|Tzn+&*vbA*y5jyp
z!SlPAGsHde%5jmGr)s&^vcyy$RpOe|^pun&pVVYu-(|_^1|uKpmO*EkHf}r&{!BZT
z&PG^%k9Q{)nf&_CJ8ey~<>7bp7Wdg-O$J4akpiB4iV$8m4K1V4tsC8*m%83OPH)|L
zIHcmr4Jb&k7(D@cLXil9-iYI&Y6jv!O9yQZ_ruUdlpj^$P>o)WlW)GEbTq)GP$#h(
zxyBlfgp)H}--_qMj!)4Lia6Z&rSpOepC-*k_%{F83n=(qya;+@>EL%gn8S%k#0QTi
z@+~D2_3C$9Hx<P~+TUmn9Gi~T={KvGfo|)!W8dmGa(`#oI}>H=H&Nmw{ZoCcR-&5u
z`n9vB87XkW9$PI#uP)|S+MZzO-5A@)({&V_>ZdulwH_H$`mH@ppntOX^_p<+?SsqH
zznyHdNBKC<h%zuZ&jAV}e-Ir<JkZE(?bNP~h`=WZ2<C*b*tO9jAi^OvW0h)kVtVpo
z)ne~#RZjNeC0?0nJ}Eg%6Gx>mCId3#MD~r<!sXKhR<*0tlkV(NJR2S~7<y4HruL8c
zC(u#M9NZQv9JWAv$_<C-gk%J6ur%4@hqBVaexcAF55@{L68$vGEfT78i!2FNgmDCG
zoLgkm*Eizb)>kkoeN83M4g5cq-HNHxBDRTs_{)NX=2&`8<Y228`Cxa1C;KXbUnS5@
zed;7==X!gCG?_i-f8@ThOEmVK8%Tjy#4Zu&=05d3*gp{YLGVLSxj;AhsgBWuy|%nU
z{n#HJ)FaUc2W2D1xi<9B9EZPpbQudq_JwPg(}7GqYry|mLz7h2wFPJ|W_p$>r*mP@
z)QE@6*V1te!K1bSe*Mm6rSdlyh6-oL6jPN@RfA|eF_-qH1V)wHR7&Yuwp;MhgkikJ
ziqZnrL)+ovb+m{Q@Rm~-UJWFr1T)yz2kf-&)Na_3M_b_wdGrKIu(i<KurjL5t!ZJ5
zi-RMbP3-|$1F?sDS#&(Qp0?m9yZ)h*OMJ4Tt7YzU{8a&6Y=V*=pOVG=;CL`BtGc;m
zd#nbs{E7GE#~?OHx6ndh7t%spTS%`rL{^fOpMMvfrj^+gEgLs}+7k%U(2w}W+BHp{
zP8-~-T8b6V+6V4XaPxqJd)d(#CgdL)I|h0*Gz;ey(?%51I=HKT^IH+<Yu~;;_<GW9
zT(+HFBl%0$G}vr#cGNYiIZQmam2NZ==vwCcAqI5NQc9rfm+yyId4{&41iF6reuy`}
zr|l_$u5XSGF$d}T0p8n1KR4v*Y!jjiOhQ1}O*@fyIAjXa4q`L*Khl{Dq`O(H?WWH%
zknT#Mub(VH+DFSVJCj!Y;Z#BWG>byI3x=qEIs<|l5O-w97P>noo@E&d+7@J?j=e||
zYzcM*dx8UDJi(DLf#5`NCQKx_5L^jv1b4zm1PQ@|ASK8Mo&+y~H^GPCOOO*L5k4mP
e5hfG-2?2yaLJ%RCpdf@0J|RrOu@|Q<W&Ia~2xSHU

diff --git a/.gradle/5.4.1/executionHistory/executionHistory.lock b/.gradle/5.4.1/executionHistory/executionHistory.lock
index f2eca88b34b250ce11e63a0999dbb1ea0ae80822..0ed7e58b4e014c3083191271d4fb4060868aeac2 100644
GIT binary patch
literal 17
UcmZS9u6e*z!2OGx0Sr{?0Vg>FumAu6

literal 17
UcmZS9u6e*z!2OGx0Sr{!0Ve?icmMzZ

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin
index 787d0f3166d71dcd2336421a983029a590906fd6..1f9c85dfbb076819a05687d0c08ce73bdda7a98d 100644
GIT binary patch
delta 1812
zcma)73s4hR6y2BIEJ&0=7E283CL(G}u_icFaqOU2Y%SGdjc8GU8O47w;%}tE&oD*&
z)QV<q3q?qj0+H27!NsbzAhc+aj(pTgw0s&7K?X#?QP95ZCiXL(j+uFzd*3<deqQqK
zayB2%=Ci8^J@{Jbz3pN2Dub{5R&2m(MeF=rf<T{Er}dm8gpbQ9-Yp%ONvgV_+#A%}
zC<R}WiIk+=Ct*QO_P(~%FEeJ%Y)c$pEyxN^<^$qM1&lMIr}B^<ZM@r*LpxJqYg4E0
z>WY3z2{NH(`NQVT0oSTNawU2yEB#Ephn*-t`8YBoc||UJ(WdU4@J;FB_|gHFtuNt6
zCr~h{JgM<~GcTp>1zM=Bu@z^<IbpGC&pwFlMhryfA+=mHc<$}wS^kpF$f&5-o^48V
zQo*=|Qb79#is9??&>0H1czF#xjKM9Q;7|w>{fJmhlAK0ff59;2r5k=4m5YFv1x=FK
zBZw8aLj+GT5Mx1Jf7|thrV_lHhId7k8LI?~w^~r{WO0+Vr!+PpD|X9f!|rB*gRM(-
zv;wX*3u5dxt(GX@1$J?Uve{x@3XCS)xVptjdcOsQvj%0yJk^4RwOt^sYF)d0sdxlV
zjRqoevF7I%A!B(5ly1ib*tC=vU;hVs98OhplnJu@k%DhkOZs=RTer8<4{or&iJsQ7
z4c2wy;d9hXu>@Dpt(P+3Q7EaD6X~)ew{AB#CQ&1LBX{^t5E66L0=}zIVnuBE;Ahrg
z)72H(?B|c>S?8>Cz)QqHZcsX%WZ-!b4iqK5bT|EK-35)U#&_v2cW^5FFXbpL{5}!a
z`lML$R35qSkk7rvfhDG#5rcC(8%vzQKvzsE_;I{sIbxp#&uxndP3U~C+&JD<`rBw{
zJz~P)LPEZ%L^4*!eymxPvLbUwd*SVxwc}0eH#?{%kvb6$n<WhIS}y6^$VM;Hk7<pI
zJ32Msa&N|!dmjkYf+np%)n5Tsg@oB@i{G0Qx{6KjZEXMrEQ}OMwQ7MBXY|0|lLGPM
zb-Yye<xzk5yJMrMs^Nx^<e>Y@DmICVXAKx6h=e<P@$+Abmc|Ih*)uBlu<ySOt7^4`
zii*xM%%lin>on-jL=1as#4zRlmKtNU`jNlc)|Vr&IM-wLu*8tJAhuA#KtLnS@UkHC
zi2HxH$I%A_{{Obe(K><j>g{p#aY6Cw?QwJwR{YhTye;3|<y26Iy2I~7>lZ&Qc`ml+
zQUOWtk_tIP&}seyE3@wR4YrqF{&9~31+ZY0?caEwTNXTamCn%Pc7N9>ivwLL)HEX;
zu5Xbt?A@#@*|%pLxcT6q(VK5U{f_gKill?!6Gm>6-%U{79IPAn?D+I^WSPb<StJb^
z3Fa^|NxAx0kBEZmY-Y_1Lw|lKc~nGYW+B9NDhj$M;2Rk=hh*^OlbwgT8MJ~wFo*OG
z#4};Q3*r+=``j4t2cyFxK<2Pi{ES4>jMzX{Q~Al#%xQtiwmZede*8<|D`QxZB;+6v
z=*&39NIj`x&(3Vry#ale-9bKI>DvQ-5SRrg+e9V<x)6K~^_ZzFFkke|j~lC8u8G-m
z=F)qU#JZg~fB0tTN~Qf$9_vZGD7>WnV?CXr#if>}!mw)mX5eaRv*<?E(J|P<uM9lb
zgejN>-Pjt6r)ZX#+Dm#wrDfoqdK#Yt-UV&_Kk%V_pxTXVGhu>#2<C~hF@P@MF<V<t
g+sABK9<*bbXpO$%u=x2m=vh*G)HS@JftGv!2{Apj9smFU

delta 1745
zcmaKse^3)w5XbX!muUGR>cw(~HVHNZSW`5p;OJl#QK3c!3o;B!`B4RbOBHc+g1@SO
z6*_>-N~ndPj5O0Iri4ozicqQ6R;@^gRj33JZBY@d0)s~Tau;m-N4c4s*?s%j-M4q|
zef3>l`Yx}%)u_9e<~JwhEmVX=c(&Pd+I?Ez=JC+xicK+DFtu4IX5P`DV+5(ozqJ;W
z8KjuGaU97AI>K1gP+s7EZSvO@>G#e)*zd^E<u}^^F@zZ8S~Nr-x`=#~j|^75!MY(-
zG|>D82`oo<>D;W^+X)*F`sQ7b{ILC&xn?-ZOgn*eh>rCuZWui1l^dRCZtIMlo&F~L
z^dy>1NKbgoJeYhrCDW59$+}oOd+u<U$3El1`&&K*@s%imHh+9zsJ=KmtbO3QZ_qb?
zBn^|GO((_ha1%)}EtTjji6^wy!Q%ux;YmH3hd4hn5kvelNc2w_X1sA#XHX*-5LF?6
zS4RbI17jePAt^|xLZW}Ij)x8tUM;|@T$T=Ju@=)-g-%W57Nw4s+78r)U5f$s-DMeU
zowo?ZaP=;mjNOh@z8GF(7k982xV|K4%Mk_2&S5CL6RD(U-GeT?cSL4hv~1|IJT(3o
z_X&n`l#s6#QgEr0?bzxM4Lk7$x}r%D({c|zQ;}v(QXrI0L1N~Cl0UFVs`LHa|3ly0
z6Sk$Yc=umZ*m7pgCkwePjE1z00t&_&_&?F;uh_(7qb4=!{jhSsR8^d#F($K_UIV`k
zNnMt#o1?y-UDtF<(<O-vk8p-(aD`kzYr;SARW&XYwe8B)mAvBxPjYsKEr<ySc9O}^
z?uYj}Xygyks$GpyRBZ3^4E4*IIhJmn6H!8%kq|R-h98flWvkb(8xWJx<NjQ>Qnq1r
zsgv2xH5>=~jC_izHt{F9N~?nd$_j0Q?g>LHrXTfEEaA|^UJmtx!~p@tjBe!jZ<UUE
zcH@4%DJm%Z!Jf5E-mNJtYP5B*sJanQnUIoo-nkZFy=3p%R9AF5q~!J;4r+SMLTkUO
zgpMBxN)lNzNjG+IV$h*G5po{m!a*;7W1(%gpzk=Mq)SdW9rcadJkylh0+oBe8{nWG
z?gZ?RL*yw8UF|C$eP;h@vAwi+&4gJQHWt!++Rs*cO9A;?@IU&%CZrhGK%#KW|IA?T
zX8Dn4u;Yu3pOI&<KVzYhXLu!GA?FPAqx#@+hN3M6L3YdIoT!*QZqQdXkhzc$(`4xv
zNfFa_xlNh3KH&+IO*^BNP=%w?!#NaD8d*5Sv?^xuB)MdVGkTb95UhfxbO9yx_zYQw
z+LPDK<GcOdF4HQU(9ayC2Cqd#2A$k<UK#U?ydo@3XFm7k>Rb+bJqL7)h)kJ4yVDfl
zb3jpcE^q$RhW7hxv<6LOOI#lu4}HG)KE^F3DAHVm0^y?)tf)s86Q0vav+;!;w(KVS
z9acYRIqM|}u1?E^3EoX$DSYfxy(7FLWmKGPvTMC!YlEZ5(){!*pzT6pn5ZTKWVMN@
z5`9{zN~c)0LEm$Ju>--Xz@09hM+~IR$5%X4O(^L`Q{$Ss@%c9kJXZ9ElDDy7v3D{A
zq_c3f?>mH|tmkS1za)MI%yYF+6OEPV#sYA^hLv64EYxvsoJE*`EiCz1m>e>8GYa~!
z<>s*1`FSEip?5R|b6bQI7msfFPu#5^y!R0llw-i5llZ_p9togYtdq?xLRKeT;2}=K
b1+4Dyu9dS~nB`Vsh`_N}#}u^+Y0tj_>dv}Z

diff --git a/.gradle/5.4.1/fileHashes/fileHashes.lock b/.gradle/5.4.1/fileHashes/fileHashes.lock
index 48bfc03e4cbc1ba8fc29dc660e1be15847719178..a36cd544db56b1853ff0bc6ff4f68f26ae0761d0 100644
GIT binary patch
literal 17
WcmZRcuuAq$@`=F93?RUA&lUhV(gmde

literal 17
WcmZRcuuAq$@`=F93?RUAcPRimI0g&=

diff --git a/.gradle/5.4.1/fileHashes/resourceHashesCache.bin b/.gradle/5.4.1/fileHashes/resourceHashesCache.bin
index 1c60897ed548bfb5ba29a5ab1225c2e8ab3b0ae9..dbcf76f8d500d58e30721c128e71bba73330b011 100644
GIT binary patch
delta 258
zcmccI!Sc9^WrK+XWAtQGiG%$6wcfttzN^6i0*tKko8L-ga`G=;eY{D&VgW>u<@RP@
zrA&T)&RCmGGYdMPf`2!!HN4EmICJw!i|x&f36mT5Nb*bQ_=?$;or0)fb=*90Pa_*Y
z&rP3S<?Q}YZNZy44_{>A_XrL@=X66ADp<Pt;_*Zd{yFDPwqKfa6)HG=v*rZ}CV`Mw
zu9?@wcW;J@?%Zs7=@u80qToVB{>{B_j)_mUkLDA|%9s7=)cgNtu|UDzdglv#lM_Fg
eOwRXOC9)ySVO5~-vy&m_N^k#eYjXseA_o9JidcOB

delta 92
zcmV-i0HgooiUiY$1h6z10a%kY7{Rj+8DI&sh9Y1Ov;Hy41_e<70CankLC0yc?l_Wz
y0b7%Sycx5yym$t)Lc_=evm(e?2(yyV4+4|TKuEIz(~1fLAepftcn`CU?8X<r<tAtV

diff --git a/.gradle/5.4.1/javaCompile/classAnalysis.bin b/.gradle/5.4.1/javaCompile/classAnalysis.bin
index 87d24373e80fc5f58765a82f056aa86ca413b3bd..a1e16d873af057ab2cfcdcc7ce72959d62e769ed 100644
GIT binary patch
delta 639
zcmXZXT}YE*6bJAg-+j0__iStK%dOnjtl3(<2BjC3Q5T~P^dgFgE{qY(2q`I+fs{F3
zw1@_6gDf_R#8Eni;fW}j7sFsRGrCw;TP9&^IvQ4_h@E(Q;CFNQ{~yjt&CQUP{cp(i
z0WwhaoO$FTP4L*o_z3MgFjg9|l{Wo*Y-JRfV@#}8AuOxn<9oj{{J6LT!zY;!vMM9t
zqFx3GkPxC?(Wfpl2UllB4Hm`hs(AiLIJ3xiR$3wWL)0T7an7_RLSj^nBuEOTwVM7i
zF+!{;OA4s2<JOp}{Se<=S_M~G_PvfIVLj<65w1mCi{ywR1yUjv+Kkkw4r!o8teu=9
zdMKy0gL1k*_2lzp+kO7eZ<nF_qc&4Re334<GXS}Q_S6tYo6qYyDSZ{%u&#uheDu$a
z$WX7&M{^F9&Et8%4@+(+_Uf)liH{2hbV!d3s2&+195D5G$#0MrO&6=_7m>m|9D2<+
z7gKPlVwz|qtwD1x61!p)a0bH`v=ucVGqNBn+J<bX5p731z+kY?q=^OQ^LC|>rWf>u
zpQHb8+GvO3g1uft4kyj;)!Z^|LOWrZI+~+I88IguL7F(-mVNr{7r#pRA;c37Mh~55
zofkA5n|A=4-*wwZR50ao4yx%s`CVn<T!>GvzlDQmoK_*3PMSM3{N`D|lgs*dqdk!I
qvz6{h#=^dsu%7S}xYNgaByiKpx`gm<gmnud_l^pWgL<0PGJgS4Mdu^{

delta 491
zcmXBOPe@a7902fr_x7IpeCnppy|*`)K6SSD{I%L{)u}_U^in}eHx&h!kk~)02qc6b
zMv%k9k6ps@5_XW`;tK^4{z37ei5-d#6B7>-Z3=c!guc+>bN_sNz6xJ9S72-$#=Uvz
zZ3<#IlakVatsRo6!mVy;O_Rf$9{riPvg_RBOZ^h@5gC{ImHZv}ijOyxre@3?C_@#H
z5tpxqquf1FNEs<76+}h%r1D`A!Z^LJ<$RbfYCH9i#nT+~c||DCexUk+#k`^eSr5;u
zRiv8K5I+f!T2e=JQcr@IRgGJpz{KLRF;R_^-;9My`G&{y?t$p)jA!xtwsHFf7?>O~
zduzn|CuR?}JT>pB@<osO<_ItSV%NNUo|_~@ED|OSIL{+peef66{m4i;P8~*O+rZA)
zB{BV|!N)D@3~3}y#3s$8g|w0=X(MMz3@yu9Sq2+-3Qj;qZ9p0Xyuatn>S#>1|JKFS
zOe`u&KOIe6uXR=Ns?Jq-((jUXO#0cM*WefS9LwO^96L54le5Qy{}+h@!$jfS%QOV=
fb1FWe<95ji$+)=6?gsh#Xq=oU7jS(vaX9=Bl={1B

diff --git a/.gradle/5.4.1/javaCompile/jarAnalysis.bin b/.gradle/5.4.1/javaCompile/jarAnalysis.bin
index 7ad9d8597d2292a1fd791a7f8d920dd95c87d21f..5a8f202a83a3dfb365e3d74943a6778658639a15 100644
GIT binary patch
delta 452
zcmaEMGJW=!j149dj9!~fB`&ZEIN2rfZxr}szyJc0Po8c5D=Wpw#Ll=;@rU?E0|~)q
zM~`+#4@Mwn0%B$$W&vVWAZ7z%b|B^eVoo6D0%C3;<^f_}Am#&NejpYAVnHAl0%Bnx
z76D>WAQl5+aUho1?&u-8bdH=c14F0|5UYT&z|)A}n_KL1%H~|3a=gS?eDQQfVGghD
zdRgKI%mUjS9~5d$|F)sgOnOG`Yu$a*FSd%bOuu(ZTx&b~6v-FN0!Nq2?|o|cPJPb7
zi2Q?p*vlptE-{?0pd;ZcVDxvVd5e=a)4TBKXtCc#leT}{DfWSJdfi3wEz|$IO1f<?
zpDnqHk>BBSXg-%oe|>x6<xY!+57QU!;}My@U<%Kq=?nG>&E8&6DW1=?{lNmsi!1`G
zjf8Yow7>k%7!rEv>DKva+Yc_4yvQi<_ECxM*)stg44+S&P+jzO;`E6vBJ$h&gCyA)
zw;x|2smCZFT^zJ@LD$R93A3FXUskJ~+rIFZgdp>Fv9*$mnFOXPyzx^Ex}Ei5I_sI|
US#dGj1sNq{8Mmu#lssSz0HeII7ytkO

delta 137
zcmbRJCF9x2^bIBwjGmiKB`&aTmX#A?WMX@{QSpcPMgs%EW=D^9M-N6IW&&bnAZ7t#
zRv=~rVs;?r0Afxc<^p1FAm#yLULfWJVtybN0AfKP76M{nAQk~)Q6LrrVsRjr*zV{d
HxpWQy|1~Ob

diff --git a/.gradle/5.4.1/javaCompile/javaCompile.lock b/.gradle/5.4.1/javaCompile/javaCompile.lock
index e6d630d9bf7eb70c459e8c34844fb222bab44585..4b0c17045f01e2f44a2202a1184cf9e77b6208c6 100644
GIT binary patch
literal 17
VcmZSPle_sf=(15O0~jdX1pqJL1la%p

literal 17
VcmZSPle_sf=(15O0~jcs1^_S41jhgX

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bd2b064..30c6d29 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,9 +7,6 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="ebd2cf14-6a1f-4718-a07e-0a5968921822" name="Default Changelist" comment="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle">
-      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/types/ConnType.h" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileChanges/last-build.bin" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.bin" beforeDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/4.10.1/fileHashes/fileHashes.lock" beforeDir="false" />
@@ -22,7 +19,6 @@
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/jarAnalysis.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/taskHistory.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
@@ -85,32 +81,13 @@
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_sqlite_base_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/libraries/Gradle__org_jetbrains_anko_supportV4_base_0_10_8_aar.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/APIRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/APIRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/BaseRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/BaseRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/RepeatTypes.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/types/RepeatTypes.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/ShuffleTypes.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/types/ShuffleTypes.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/SongRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Tok.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/manager/Tok.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/TokenRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/TokenRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/UserRepository.cpp" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/UserRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/Demo.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/Demo.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/mear.iml" beforeDir="false" afterPath="$PROJECT_DIR$/mear.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -135,16 +112,17 @@
     </system>
   </component>
   <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.49960223">
+    <splitter split-orientation="horizontal" split-proportion="0.5053305">
       <split-first>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="false">
-            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="292">
-                  <caret line="230" column="31" selection-start-line="230" selection-start-column="31" selection-end-line="230" selection-end-column="31" />
+                <state relative-caret-position="534">
+                  <caret line="47" column="13" selection-start-line="47" selection-start-column="13" selection-end-line="47" selection-end-column="13" />
                   <folding>
-                    <element signature="e#40#57#0" expanded="true" />
+                    <element signature="e#83#102#0" expanded="true" />
+                    <element signature="e#497#554#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -153,7 +131,7 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="886">
+                <state relative-caret-position="5552">
                   <caret line="380" selection-start-line="380" selection-end-line="380" />
                   <folding>
                     <element signature="e#37#1331#0" expanded="true" />
@@ -177,17 +155,30 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="464">
-                  <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
+                <state relative-caret-position="432">
+                  <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
                 </state>
               </provider>
             </entry>
           </file>
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="368">
+                  <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="8" />
+                  <folding>
+                    <element signature="e#103#120#0" expanded="true" />
+                    <element signature="e#501#555#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Song.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="448">
-                  <caret line="28" selection-start-line="28" selection-end-line="28" />
+                <state relative-caret-position="144">
+                  <caret line="9" selection-start-line="9" selection-end-line="9" />
                   <folding>
                     <element signature="e#82#99#0" expanded="true" />
                   </folding>
@@ -195,15 +186,37 @@
               </provider>
             </entry>
           </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="2288">
+                  <caret line="143" column="35" selection-start-line="143" selection-start-column="35" selection-end-line="143" selection-end-column="35" />
+                  <folding>
+                    <element signature="e#102#119#0" expanded="true" />
+                    <element signature="e#465#496#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-first>
       <split-second>
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-          <file pinned="false" current-in-tab="true">
+          <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="432">
-                  <caret line="34" selection-start-line="34" selection-end-line="34" />
+                <state relative-caret-position="112">
+                  <caret line="14" column="14" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
+                </state>
+              </provider>
+            </entry>
+          </file>
+          <file pinned="false" current-in-tab="false">
+            <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="96">
+                  <caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
                 </state>
               </provider>
             </entry>
@@ -211,15 +224,19 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="736">
-                  <caret line="46" column="31" selection-start-line="46" selection-start-column="31" selection-end-line="46" selection-end-column="31" />
+                <state relative-caret-position="1040">
+                  <caret line="65" column="11" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="11" />
                   <folding>
-                    <element signature="e#220#274#0" expanded="true" />
-                    <element signature="e#419#473#0" expanded="true" />
-                    <element signature="e#602#656#0" expanded="true" />
-                    <element signature="e#783#837#0" expanded="true" />
-                    <element signature="e#956#1010#0" expanded="true" />
-                    <element signature="e#1126#1180#0" expanded="true" />
+                    <element signature="e#231#257#0" expanded="true" />
+                    <element signature="e#315#343#0" expanded="true" />
+                    <element signature="e#481#509#0" expanded="true" />
+                    <element signature="e#646#674#0" expanded="true" />
+                    <element signature="e#1387#1434#0" expanded="true" />
+                    <element signature="e#1852#1899#0" expanded="true" />
+                    <element signature="e#936#964#0" expanded="true" />
+                    <element signature="e#1063#1091#0" expanded="true" />
+                    <element signature="e#1262#1309#0" expanded="true" />
+                    <element signature="e#1820#1867#0" expanded="true" />
                   </folding>
                 </state>
               </provider>
@@ -228,7 +245,7 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="646">
+                <state relative-caret-position="1056">
                   <caret line="66" column="56" selection-start-line="66" selection-start-column="56" selection-end-line="66" selection-end-column="56" />
                   <folding>
                     <element signature="e#104#121#0" expanded="true" />
@@ -241,8 +258,8 @@
           <file pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1280">
-                  <caret line="80" column="70" selection-start-line="80" selection-start-column="70" selection-end-line="80" selection-end-column="70" />
+                <state relative-caret-position="176">
+                  <caret line="11" selection-start-line="11" selection-end-line="11" />
                   <folding>
                     <element signature="e#102#119#0" expanded="true" />
                     <element signature="e#231#257#0" expanded="true" />
@@ -251,6 +268,18 @@
               </provider>
             </entry>
           </file>
+          <file pinned="false" current-in-tab="true">
+            <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
+              <provider selected="true" editor-type-id="text-editor">
+                <state relative-caret-position="16">
+                  <caret line="47" selection-start-line="47" selection-end-line="47" />
+                  <folding>
+                    <element signature="e#40#57#0" expanded="true" />
+                  </folding>
+                </state>
+              </provider>
+            </entry>
+          </file>
         </leaf>
       </split-second>
     </splitter>
@@ -278,9 +307,7 @@
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/BaseRepository.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/RepeatRepository.kt" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/model/CoverArt.h" />
-        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.cpp" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/IcarusSongActivity.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/adapters/SongAdapter.kt" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/model/Token.h" />
@@ -296,7 +323,6 @@
         <option value="$PROJECT_DIR$/app/src/main/cpp/CoverArtRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/res/menu/popup_menu.xml" />
         <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
-        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt" />
         <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/APIRepository.cpp" />
@@ -309,7 +335,6 @@
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp" />
-        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp" />
@@ -319,19 +344,24 @@
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.cpp" />
-        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt" />
-        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/model/Song.h" />
         <option value="$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.cpp" />
+        <option value="$PROJECT_DIR$/app/src/main/cpp/Demo.h" />
       </list>
     </option>
   </component>
   <component name="OCFindUsagesOptions" text="true" ivars="false" properties="true" derivedClasses="false" />
   <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="960" />
     <option name="y" value="-16" />
-    <option name="width" value="640" />
+    <option name="width" value="960" />
     <option name="height" value="1079" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -341,6 +371,7 @@
     </navigator>
     <panes>
       <pane id="Scope" />
+      <pane id="PackagesPane" />
       <pane id="AndroidView" />
       <pane id="ProjectPane">
         <subPane>
@@ -391,7 +422,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="cpp" type="462c0819:PsiDirectoryNode" />
-              <item name="model" type="462c0819:PsiDirectoryNode" />
+              <item name="repository" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mear" type="b2602c69:ProjectViewProjectNode" />
@@ -400,7 +431,7 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="cpp" type="462c0819:PsiDirectoryNode" />
-              <item name="types" type="462c0819:PsiDirectoryNode" />
+              <item name="utility" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="mear" type="b2602c69:ProjectViewProjectNode" />
@@ -427,49 +458,12 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="mear" type="462c0819:PsiDirectoryNode" />
-              <item name="activities" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="mear" type="462c0819:PsiDirectoryNode" />
-              <item name="repositories" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="res" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="res" type="462c0819:PsiDirectoryNode" />
-              <item name="menu" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="mear" type="b2602c69:ProjectViewProjectNode" />
-              <item name="mear" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="app" type="8a07ba80:GradleTreeStructureProvider$GradleModuleDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="res" type="462c0819:PsiDirectoryNode" />
-              <item name="values" type="462c0819:PsiDirectoryNode" />
+              <item name="models" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -623,11 +617,19 @@
       <option name="project" value="LOCAL" />
       <updated>1574733783595</updated>
     </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Doing some refactoring and some skeleton work for downloading songs">
+      <created>1575075251084</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1575075251084</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="-16" width="1920" height="1079" extended-state="6" />
+    <editor active="true" />
     <layout>
       <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
       <window_info id="Structure" order="1" side_tool="true" />
@@ -638,17 +640,17 @@
       <window_info content_ui="combo" id="Project" order="6" weight="0.36567163" />
       <window_info id="Resources Explorer" order="7" weight="0.32995737" />
       <window_info id="Capture Tool" order="8" />
-      <window_info active="true" anchor="bottom" id="Messages" visible="true" weight="0.32954547" />
       <window_info anchor="bottom" id="Run" order="0" />
       <window_info anchor="bottom" id="Logcat" order="1" />
       <window_info anchor="bottom" id="TODO" order="2" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.33264464" />
       <window_info anchor="bottom" id="Terminal" order="4" />
       <window_info anchor="bottom" id="Event Log" order="5" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" order="6" />
+      <window_info anchor="bottom" id="Version Control" order="6" weight="0.32920536" />
       <window_info anchor="bottom" id="Find" order="7" weight="0.3285124" />
-      <window_info anchor="bottom" id="Build" order="8" weight="0.3285124" />
-      <window_info anchor="bottom" id="Android Profiler" order="9" />
+      <window_info anchor="bottom" id="Android Profiler" order="8" show_stripe_button="false" />
+      <window_info anchor="bottom" id="Messages" order="9" weight="0.32954547" />
+      <window_info anchor="bottom" id="Build" order="10" visible="true" weight="0.338843" />
       <window_info anchor="right" id="Capture Analysis" order="0" />
       <window_info anchor="right" id="Gradle" order="1" />
       <window_info anchor="right" id="Theme Preview" order="2" />
@@ -667,7 +669,9 @@
     <MESSAGE value="jni memory leak fix" />
     <MESSAGE value="Adding downloading functionality, left TODO's on where to pick up from" />
     <MESSAGE value="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle" />
-    <option name="LAST_COMMIT_MESSAGE" value="ddWorking on implementing the Toggle controls like Repeat and Shuffle. Having a little issues with Repeat, haven't started with Shuffle" />
+    <MESSAGE value="Doing some refactoring and some skeleton work for downloading songs" />
+    <MESSAGE value="Continuing work on download functionality" />
+    <option name="LAST_COMMIT_MESSAGE" value="Continuing work on download functionality" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -752,7 +756,7 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="kotlin-line">
           <url>file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt</url>
-          <line>36</line>
+          <line>37</line>
           <properties />
           <option name="timeStamp" value="187" />
         </line-breakpoint>
@@ -838,15 +842,58 @@
         </line-breakpoint>
         <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
           <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
-          <line>302</line>
+          <line>314</line>
           <option name="timeStamp" value="182" />
         </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>111</line>
+          <option name="timeStamp" value="188" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>93</line>
+          <option name="timeStamp" value="189" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>46</line>
+          <option name="timeStamp" value="190" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>36</line>
+          <option name="timeStamp" value="191" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>55</line>
+          <option name="timeStamp" value="193" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>78</line>
+          <option name="timeStamp" value="194" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>65</line>
+          <option name="timeStamp" value="195" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h</url>
+          <line>24</line>
+          <option name="timeStamp" value="196" />
+        </line-breakpoint>
+        <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
+          <url>file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp</url>
+          <line>675</line>
+          <option name="timeStamp" value="200" />
+        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$USER_HOME$/AndroidStudio/DeviceExplorer/motorola-moto_e__4__plus-ZY2248HP8X/data/data/com.example.mear/mear.db3" />
-    <entry file="file://$USER_HOME$/AndroidStudio/DeviceExplorer/motorola-moto_e__4__plus-ZY2248HP8X/data/data/com.example.mear/databases/Mear" />
     <entry file="file://$USER_HOME$/Android/Sdk/ndk/20.0.5594570/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/include/c++/v1/string">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="112">
@@ -943,20 +990,20 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/popup_layout.xml">
-      <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
+      <provider editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/main.xml">
-      <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
+      <provider editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/activity_main_drawer.xml">
-      <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
+      <provider editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/menu_song_view.xml">
-      <provider editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="android-designer2" />
+      <provider editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/IcarusSongActivity.kt">
       <provider selected="true" editor-type-id="text-editor">
@@ -973,40 +1020,16 @@
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/popup_menu.xml">
+      <provider editor-type-id="android-designer2" />
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="160">
           <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" />
         </state>
       </provider>
-      <provider editor-type-id="android-designer2" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2336">
-          <caret line="162" column="40" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
-          <folding>
-            <element signature="e#43#596#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/BaseRepository.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/CoverArtRepository.cpp" />
     <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="624">
@@ -1014,16 +1037,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="886">
-          <caret line="380" selection-start-line="380" selection-end-line="380" />
-          <folding>
-            <element signature="e#37#1331#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/APIRepository.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="774">
@@ -1045,16 +1058,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="128">
-          <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
-          <folding>
-            <element signature="e#701#732#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="736">
@@ -1062,13 +1065,7 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/RepeatRepository.cpp" />
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="606">
@@ -1093,34 +1090,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/Tok.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="1" selection-start-column="1" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="48">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="64">
-          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="2" selection-start-line="2" selection-start-column="2" selection-end-line="2" selection-end-column="2" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/Tok.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/ShuffleRepository.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.cpp" />
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/Tok.h">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="22">
@@ -1133,9 +1106,113 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.cpp" />
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="534">
+          <caret line="47" column="13" selection-start-line="47" selection-start-column="13" selection-end-line="47" selection-end-column="13" />
+          <folding>
+            <element signature="e#83#102#0" expanded="true" />
+            <element signature="e#497#554#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/activities/MainActivity.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="5552">
+          <caret line="380" selection-start-line="380" selection-end-line="380" />
+          <folding>
+            <element signature="e#37#1331#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/playback/service/MusicService.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2336">
+          <caret line="162" column="40" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="40" />
+          <folding>
+            <element signature="e#43#596#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="432">
+          <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="368">
+          <caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="8" />
+          <folding>
+            <element signature="e#103#120#0" expanded="true" />
+            <element signature="e#501#555#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Song.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="144">
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
+          <folding>
+            <element signature="e#82#99#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/SongRepository.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2288">
+          <caret line="143" column="35" selection-start-line="143" selection-start-column="35" selection-end-line="143" selection-end-column="35" />
+          <folding>
+            <element signature="e#102#119#0" expanded="true" />
+            <element signature="e#465#496#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="112">
+          <caret line="14" column="14" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/models/Song.kt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="96">
+          <caret line="6" column="35" selection-start-line="6" selection-start-column="35" selection-end-line="6" selection-end-column="35" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1040">
+          <caret line="65" column="11" selection-start-line="65" selection-start-column="11" selection-end-line="65" selection-end-column="11" />
+          <folding>
+            <element signature="e#231#257#0" expanded="true" />
+            <element signature="e#315#343#0" expanded="true" />
+            <element signature="e#481#509#0" expanded="true" />
+            <element signature="e#646#674#0" expanded="true" />
+            <element signature="e#1387#1434#0" expanded="true" />
+            <element signature="e#1852#1899#0" expanded="true" />
+            <element signature="e#936#964#0" expanded="true" />
+            <element signature="e#1063#1091#0" expanded="true" />
+            <element signature="e#1262#1309#0" expanded="true" />
+            <element signature="e#1820#1867#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/TokenRepository.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="646">
+        <state relative-caret-position="1056">
           <caret line="66" column="56" selection-start-line="66" selection-start-column="56" selection-end-line="66" selection-end-column="56" />
           <folding>
             <element signature="e#104#121#0" expanded="true" />
@@ -1144,17 +1221,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.cpp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="32">
-          <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/repository/UserRepository.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1280">
-          <caret line="80" column="70" selection-start-line="80" selection-start-column="70" selection-end-line="80" selection-end-column="70" />
+        <state relative-caret-position="176">
+          <caret line="11" selection-start-line="11" selection-end-line="11" />
           <folding>
             <element signature="e#102#119#0" expanded="true" />
             <element signature="e#231#257#0" expanded="true" />
@@ -1162,65 +1232,16 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/utility/GeneralUtility.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="112">
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
-          <folding>
-            <element signature="e#103#238#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/CMakeLists.txt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="464">
-          <caret line="29" column="8" selection-start-line="29" selection-start-column="8" selection-end-line="29" selection-end-column="8" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/app/src/main/cpp/Demo.cpp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="292">
-          <caret line="230" column="31" selection-start-line="230" selection-start-column="31" selection-end-line="230" selection-end-column="31" />
+        <state relative-caret-position="16">
+          <caret line="47" selection-start-line="47" selection-end-line="47" />
           <folding>
             <element signature="e#40#57#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/model/Song.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="448">
-          <caret line="28" selection-start-line="28" selection-end-line="28" />
-          <folding>
-            <element signature="e#82#99#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/cpp/manager/DirectoryManager.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="736">
-          <caret line="46" column="31" selection-start-line="46" selection-start-column="31" selection-end-line="46" selection-end-column="31" />
-          <folding>
-            <element signature="e#220#274#0" expanded="true" />
-            <element signature="e#419#473#0" expanded="true" />
-            <element signature="e#602#656#0" expanded="true" />
-            <element signature="e#783#837#0" expanded="true" />
-            <element signature="e#956#1010#0" expanded="true" />
-            <element signature="e#1126#1180#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/mear/repositories/TrackRepository.kt">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="432">
-          <caret line="34" selection-start-line="34" selection-end-line="34" />
-        </state>
-      </provider>
-    </entry>
   </component>
   <component name="masterDetails">
     <states>
diff --git a/app/src/main/cpp/Demo.cpp b/app/src/main/cpp/Demo.cpp
index 6452d03..cbba3de 100644
--- a/app/src/main/cpp/Demo.cpp
+++ b/app/src/main/cpp/Demo.cpp
@@ -58,6 +58,9 @@ jobject songToObj(JNIEnv *env, const model::Song& song)
     jmethodID songDuration = env->GetMethodID( songClass,  "setDuration", "(I)V" );
     jmethodID songYear = env->GetMethodID( songClass,  "setYear", "(I)V" );
     jmethodID songCoverArtId = env->GetMethodID(songClass, "setCoverArtId", "(I)V");
+    jmethodID songPathId = env->GetMethodID(songClass, "setPath", "(Ljava/lang/String;)V");
+    jmethodID songFilenameId = env->GetMethodID(songClass, "setFilename", "(Ljava/lang/String;)V");
+    jmethodID songDownloadedId = env->GetMethodID(songClass, "setDownloaded", "(B)V");
 
     jint id = song.id;
     jstring title = env->NewStringUTF(song.title.c_str());
@@ -68,6 +71,10 @@ jobject songToObj(JNIEnv *env, const model::Song& song)
     jint duration = song.duration;
     jint year = song.year;
     jint coverArtId = song.coverArtId;
+    jstring songPath = env->NewStringUTF(song.path.c_str());
+    jstring songFilename = env->NewStringUTF(song.filename.c_str());
+    jboolean songDownloaded = song.downloaded;
+
 
     env->CallVoidMethod( songObj, songId, id );
     env->CallVoidMethod(songObj, songTitle, title);
@@ -78,12 +85,17 @@ jobject songToObj(JNIEnv *env, const model::Song& song)
     env->CallVoidMethod(songObj, songDuration, duration);
     env->CallVoidMethod(songObj, songYear, year);
     env->CallVoidMethod(songObj, songCoverArtId, coverArtId);
+    env->CallVoidMethod(songObj, songPathId, songPath);
+    env->CallVoidMethod(songObj, songFilenameId, songFilename);
+    env->CallVoidMethod(songObj, songDownloadedId, songDownloaded);
 
     env->DeleteLocalRef(title);
     env->DeleteLocalRef(album);
     env->DeleteLocalRef(albumArtist);
     env->DeleteLocalRef(artist);
     env->DeleteLocalRef(genre);
+    env->DeleteLocalRef(songPath);
+    env->DeleteLocalRef(songFilename);
 
     return songObj;
 }
@@ -404,24 +416,6 @@ Java_com_example_mear_repositories_TrackRepository_retrieveSong(
     return fetchedSongObj;
 }
 
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_TrackRepositories_downloadSong(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject tokenObj,
-        jobject songObj,
-        jstring uriStr
-        ) {
-    // TODO: left off here
-    model::Song downloadedSong;
-    auto downloadedSongObj = songToObj(env, downloadedSong);
-
-    return downloadedSongObj;
-
-}
-
 extern "C"
 JNIEXPORT jobject
 JNICALL
@@ -648,7 +642,6 @@ Java_com_example_mear_repositories_APIRepository_saveAPIInfoRecord(
     saveAPIInfo(apiInfo, path);
 }
 
-
 extern "C"
 JNIEXPORT void
 JNICALL
@@ -669,6 +662,21 @@ Java_com_example_mear_repositories_TokenRepository_saveTokenRecord(
     saveToken(token, path);
 }
 
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_TrackRepositories_downloadSong(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject tokenObj,
+        jobject songObj,
+        jstring uriStr
+) {
+    // TODO: left off here
+    auto song = ObjToSong<jobject, JNIEnv>(env, songObj);
+
+}
+
 extern "C"
 JNIEXPORT void
 JNICALL
diff --git a/app/src/main/cpp/Demo.h b/app/src/main/cpp/Demo.h
index 82a1512..ee52dfa 100644
--- a/app/src/main/cpp/Demo.h
+++ b/app/src/main/cpp/Demo.h
@@ -24,6 +24,32 @@ std::string jstringToString(JNIEnv*, jstring&);
 
 model::APIInfo retrieveAPIInfo(const std::string&);
 
+template<typename SongObj, typename JE, class Song = model::Song>
+Song ObjToSong(JE *env, SongObj obj) {
+    jclass songClass = env->GetObjectClass(obj);
+    //jmethodID jconstructor = env->GetMethodID( songClass,  "<init>", "()V" );
+    //jobject songObj = env->NewObject( songClass, jconstructor );
+
+    auto songId = env->GetFieldID( songClass,  "id", "I" );
+    auto songTitle = env->GetFieldID( songClass,  "title", "Ljava/lang/String;" );
+    auto songAlbum = env->GetFieldID( songClass,  "album", "Ljava/lang/String;" );
+    auto songAlbumArtist = env->GetFieldID(songClass, "albumArtist", "Ljava/lang/String;");
+    auto songArtist = env->GetFieldID( songClass,  "artist", "Ljava/lang/String;" );
+    auto songGenre = env->GetFieldID( songClass,  "genre", "Ljava/lang/String;" );
+    auto songDuration = env->GetFieldID( songClass,  "duration", "I" );
+    auto songYear = env->GetFieldID( songClass,  "year", "I" );
+    auto songCoverArtId = env->GetFieldID(songClass, "coverArtId", "I");
+    auto songPathId = env->GetFieldID(songClass, "path", "Ljava/lang/String;");
+    auto songFilenameId = env->GetFieldID(songClass, "filename", "Ljava/lang/String;");
+    auto songDownloadedId = env->GetFieldID(songClass, "downloaded", "B");
+
+    auto titleVal = (jstring)env->GetObjectField(obj, songTitle);
+
+    Song song;
+
+    return song;
+}
+
 model::Song retrieveSong(const model::Token&, const model::Song&, const std::string&);
 
 model::Token fetchToken(const model::User&, const std::string&);
@@ -44,6 +70,10 @@ void saveCredentials(const model::User&, const std::string&);
 void saveToken(const model::Token&, const std::string&);
 void updateRepeatMode(const std::string&);
 void updateShuffleMode(const std::string&);
+template<class Song = model::Song>
+void downloadSong(Song& song) {
+
+}
 
 
 
diff --git a/app/src/main/cpp/manager/DirectoryManager.h b/app/src/main/cpp/manager/DirectoryManager.h
index 319d383..d372610 100644
--- a/app/src/main/cpp/manager/DirectoryManager.h
+++ b/app/src/main/cpp/manager/DirectoryManager.h
@@ -6,48 +6,122 @@
 #define MEAR_DIRECTORYMANAGER_H
 
 #include <string>
+#include <cstdio>
+#include <dirent.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 #include "../model/Song.h"
+#include "../utility/GeneralUtility.h"
 
 namespace manager {
+    template<class Song = model::Song>
     class DirectoryManager {
     public:
-        template<typename Str = std::string, class Song = model::Song>
+        template<typename Str = std::string>
         Str fullSongPath(const Song& song, const Str& path) {
-            auto s = "";
+            auto s = utility::GeneralUtility::appendForwardSlashToUri(path);
+            s.append(song.albumArtist);
+            s.append("/");
+            s.append(song.album);
+            s.append("/");
+            s.append(song.filename);
 
             return s;
         }
 
-        template<typename Str = std::string, class Song = model::Song>
+        template<typename Str = std::string>
         Str albumPath(const Song& song, const Str& path) {
-            auto ss = "";
+            auto s = utility::GeneralUtility::appendForwardSlashToUri(path);
+            s.append(song.albumArtist);
+            s.append("/");
+            s.append(song.album);
 
-            return ss;
+            return s;
         }
 
-        template<typename Str = std::string, class Song = model::Song>
+        template<typename Str = std::string>
         Str artistPath(const Song& song, const Str& path) {
-            return "art";
+            auto s = utility::GeneralUtility::appendForwardSlashToUri(path);
+            s.append(song.albumArtist);
+
+            return s;
         }
 
 
-        template<typename Str = std::string, class Song = model::Song>
-        bool doesSongExist(const Song& song, const Str& path) {
-            return false;
+        template<typename Str = std::string, typename B = bool>
+        B doesSongExist(const Song& song, const Str& path) {
+            auto s = albumPath(song, path);
+            s.append("/");
+            s.append(song.filename);
+
+            stat buffer;
+            return (stat (s.c_str(), &buffer) == 0);
+        }
+
+        template<typename Str = std::string, typename B = bool>
+        B deleteSong(const Song& song, const Str& path) {
+            auto s = fullSongPath(song, path);
+            auto result = std::remove(s.c_str());
+
+            if (result == 0) {
+                return true;
+            } else {
+                return false;
+            }
         }
 
 
-        template<typename Str = std::string, class Song = model::Song>
+        template<typename Str = std::string>
         void createSongDirectory(const Song& song, const Str& path) {
-
+            if (!artistDirectoryExists(song, path)) {
+                auto status = mkdir(artistPath(song, path).c_str(), 0777);
+            }
+            if (!albumDirectoryExists(song, path)) {
+                auto status = mkdir(albumPath(song, path), 0777);
+            }
         }
 
-        template<typename Str = std::string, class Song = model::Song>
+        template<typename Str = std::string>
         void deleteSongDirectory(const Song& song, const Str& path) {
 
         }
     private:
+        template<typename Str = std::string, typename B = bool>
+        B albumDirectoryExists(const Song song, const Str& path) {
+            auto albumPath = utility::GeneralUtility::appendForwardSlashToUri(path);
+            albumPath.append(song.albumArtist);
+            albumPath.append("/");
+            albumPath.append(song.album);
+            DIR* dir = opendir(albumPath.c_str());
+
+            if (dir) {
+                closedir(dir);
+                return true;
+            } else if (ENOENT == errno) {
+                return false;
+            }
+
+            return true;
+        }
+
+        template<typename Str = std::string, typename B = bool>
+        B artistDirectoryExists(const Song song, const Str& path) {
+            auto artistPath = utility::GeneralUtility::appendForwardSlashToUri(path);
+            artistPath.append(song.albumArtist);
+            DIR* dir = opendir(artistPath.c_str());
+
+            if (dir) {
+                closedir(dir);
+                return true;
+            } else if (ENOENT == errno) {
+                return false;
+            }
+
+            return true;
+        }
     };
 }
 
diff --git a/app/src/main/cpp/model/Song.h b/app/src/main/cpp/model/Song.h
index 3b6cad7..84825ef 100644
--- a/app/src/main/cpp/model/Song.h
+++ b/app/src/main/cpp/model/Song.h
@@ -10,36 +10,35 @@
 
 
 namespace model {
+    class Song {
+    public:
+        Song() = default;
+        Song(const int id) : id(id) { }
+        Song(const int id, const std::string& title, const std::string& artist,
+                const std::string& album, const std::string& genre,
+                const int duration, const int year) :
+                id(id), title(title), artist(artist), album(album),
+                genre(genre), duration(duration), year(year) { }
+        Song(const int id, const std::string& title, const std::string& artist,
+                const std::string& album, const std::string& albumArtist, const std::string& genre,
+                const int duration, const int year, const int coverArtId) :
+                id(id), title(title), artist(artist), album(album), albumArtist(albumArtist),
+                genre(genre), duration(duration), year(year), coverArtId(coverArtId) { }
 
-class Song
-{
-public:
-    Song() = default;
-    Song(const int id) : id(id) { }
-    Song(const int id, const std::string& title, const std::string& artist,
-            const std::string& album, const std::string& genre,
-            const int duration, const int year) :
-            id(id), title(title), artist(artist), album(album),
-            genre(genre), duration(duration), year(year) { }
-    Song(const int id, const std::string& title, const std::string& artist,
-         const std::string& album, const std::string& albumArtist, const std::string& genre,
-         const int duration, const int year, const int coverArtId) :
-            id(id), title(title), artist(artist), album(album), albumArtist(albumArtist),
-            genre(genre), duration(duration), year(year), coverArtId(coverArtId) { }
-
-    int id;
-    std::string title;
-    std::string artist;
-    std::string album;
-    std::string albumArtist;
-    std::string genre;
-    int duration;
-    int year;
-    int coverArtId;
-    std::vector<char> data;
-    bool downloaded;
-    std::string path;
-};
+        int id;
+        std::string title;
+        std::string artist;
+        std::string album;
+        std::string albumArtist;
+        std::string genre;
+        int duration;
+        int year;
+        int coverArtId;
+        std::vector<char> data;
+        bool downloaded;
+        std::string path;
+        std::string filename;
+    };
 }
 
 #endif //MEAR_SONG_H
diff --git a/app/src/main/cpp/repository/SongRepository.h b/app/src/main/cpp/repository/SongRepository.h
index 50b6e3c..52ada8a 100644
--- a/app/src/main/cpp/repository/SongRepository.h
+++ b/app/src/main/cpp/repository/SongRepository.h
@@ -140,6 +140,8 @@ namespace repository {
             auto res = curl_easy_perform(curl);
             curl_easy_cleanup(curl);
             downloadedSong.data = std::move(std::vector<char>(data.begin(), data.end()));
+            downloadedSong.filename = downloadedSong.title;
+            downloadedSong.filename.append(".mp3");
 
             return downloadedSong;
         }
diff --git a/app/src/main/java/com/example/mear/models/Song.kt b/app/src/main/java/com/example/mear/models/Song.kt
index 603eab5..9b6313a 100644
--- a/app/src/main/java/com/example/mear/models/Song.kt
+++ b/app/src/main/java/com/example/mear/models/Song.kt
@@ -3,4 +3,5 @@ package com.example.mear.models
 class Song (var id: Int = 3, var title: String = "", var album: String = "",
             var albumArtist: String = "", var artist: String = "",
             var genre: String = "", var year: Int = 0, var duration: Int = 0,
-            var coverArtId: Int = 0)
+            var coverArtId: Int = 0, var downloaded: Boolean = false, var path: String = "",
+            var filename: String = "")
diff --git a/app/src/main/java/com/example/mear/repositories/TrackRepository.kt b/app/src/main/java/com/example/mear/repositories/TrackRepository.kt
index a5f11dc..4c67925 100644
--- a/app/src/main/java/com/example/mear/repositories/TrackRepository.kt
+++ b/app/src/main/java/com/example/mear/repositories/TrackRepository.kt
@@ -21,7 +21,8 @@ class TrackRepository(var context: Context? = null) {
     private external fun retrieveSongs(token: Token, uri: String): Array<Song>
 
     private external fun retrieveSong(token: Token, song: Song, uri: String): Song
-    private external fun downloadSong(token: Token, song: Song, uri: String): Song
+
+    private external fun downloadSong(token: Token, song: Song, uri: String)
 
 
     fun fetchSongs(token: Token, uri: String): Array<Song> {
@@ -33,10 +34,8 @@ class TrackRepository(var context: Context? = null) {
         return retrieveSong(token, song, uri)
     }
 
-    fun fetchSongFile(token: Token, song: Song, uri: String): Song {
-        val downloadedSong = downloadSong(token, song, uri)
-
-        return downloadedSong
+    fun fetchSongFile(token: Token, song: Song, uri: String) {
+        downloadSong(token, song, uri)
     }