From dcc232033208ad25606b86c6f89ad43d3bb28ed9 Mon Sep 17 00:00:00 2001
From: kdeng00 <kundeng94@gmail.com>
Date: Sun, 15 Dec 2019 14:47:14 -0500
Subject: [PATCH] Switched from Method-base JNI class construction to
 Field-base JNI class construction. Was dealing with some issues with
 returning a Java/Kotlin class from a C/C++ class.

---
 app/app.iml                                  |   8 +-
 app/build.gradle                             |   1 -
 app/src/main/cpp/CMakeLists.txt              |   8 +-
 app/src/main/cpp/Demo.cpp                    | 688 +-----------------
 app/src/main/cpp/Demo.h                      |  80 ---
 app/src/main/cpp/Demo.hpp                    | 714 +++++++++++++++++++
 app/src/main/cpp/repository/SongRepository.h |   6 +
 build.gradle                                 |   2 +-
 8 files changed, 728 insertions(+), 779 deletions(-)
 delete mode 100644 app/src/main/cpp/Demo.h
 create mode 100644 app/src/main/cpp/Demo.hpp

diff --git a/app/app.iml b/app/app.iml
index dac30dd..a44adb5 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -4,8 +4,8 @@
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
         <option name="GRADLE_PROJECT_PATH" value=":app" />
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.2" />
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.2" />
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.3" />
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.3" />
       </configuration>
     </facet>
     <facet type="native-android-gradle" name="Native-Android-Gradle">
@@ -30,11 +30,11 @@
       </configuration>
     </facet>
     <facet type="kotlin-language" name="Kotlin">
-      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false" pureKotlinSourceFolders="$MODULE_DIR$/src/debug/kotlin;/home/brahmix/programming/kotlin/mear/app/src/debug/java;/home/brahmix/programming/kotlin/mear/app/src/release/kotlin;/home/brahmix/programming/kotlin/mear/app/src/release/java;/home/brahmix/programming/kotlin/mear/app/src/debugAndroidTest/kotlin;/home/brahmix/programming/kotlin/mear/app/src/debugUnitTest/kotlin;/home/brahmix/programming/kotlin/mear/app/src/releaseUnitTest/kotlin">
+      <configuration version="3" platform="JVM 1.6" allPlatforms="JVM [1.6]" useProjectSettings="false">
         <compilerSettings />
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/271d6925984ff7b9602a1eb73e49001f/ealvalog-android-0.5.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/dfab7af05bbfe12f5824cc6f5232821d/anko-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/26dc1b639e7fc0a30a965e231590a69e/picasso-2.71828-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2861b2f30b27584d44188d9179f96df7/anko-sqlite-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4c385883d77baa2291ca93003945a938/anko-sdk27-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8a8db17fa2d6bfa1cc2fce8404e4a56f/anko-sdk27-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5805ef6f5579d5b583db72ac1701ed6d/anko-appcompat-v7-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/42db35e9dbef9e97798dddf5f7610ccf/anko-support-v4-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/92c984a87cca2d4d0b09329d02b2f12c/anko-appcompat-v7-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4b3655bcefc6566df82516d7045b0b1e/anko-appcompat-v7-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0ef4dff7ecd7e6935805b52a9d091a31/anko-support-v4-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/857a8ee5a26b0022cbd52317b41a9b20/anko-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/88e5b591e82443eb7723dbf0b28a0f3b/anko-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d827ea25c9883ce7319b6784a09b511f/sqlite-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/af34a4220d8cc456f9b4fcbd39bd9caf/platform-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/088f0f447b747aebb7413ba4310fcf6f/appcompatV7-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9e91d7d165d6c5efa9f3be07555538b1/supportV4-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/87308e003b68d096c43dca2028f7c160/commons-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b5fb1710cef00ad16e437bb9e3ca88d6/design-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8cb4ece18c428eee2b2d2f816e1765ce/appcompat-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/afeedcf4daf261fdaf96737d77a34927/cardview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35dccd0aced25481287ee2555b049a1f/support-v4-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4bf174fa149f5a07417d46721d57d4ca/support-fragment-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9fb0db39c3a86bc0cf1f565867f332b8/animated-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/44c33949c0e9e6dd708260cd8308594a/recyclerview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a99e84cffddca52b0fee4289e089ed61/support-core-ui-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1e829ced447316a53103caa5aaf8b597/support-core-utils-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bb83ef7a230e8de67545c9b22fb3a41d/support-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/af69f834453339f26013f22add42d8ff/support-media-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/610dccbd018999b294982ac65792b123/transition-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/327b41a2ca4c117cfeb16798bcc3f4d9/loader-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ddde2ebc4ed311a8b54356605c6c7f6c/viewpager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8c4654165c8d458da0813644293f11c5/coordinatorlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/344b88a0eccf8c1c8d0d993348ba92ba/drawerlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/37654f73464414bf65dd7e950c798518/slidingpanelayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8979616f7b752abef751da7fb2f650af/customview-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a359656a7bee87a41a0b4d8ea11165c2/swiperefreshlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/2b9e2577e9491fc82a9be8665477dc23/asynclayoutinflater-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7b11524d69766eb26f054cf5eb8d3381/support-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a59b6eb9af4a08f3dc8d4b9220e15962/versionedparcelable-28.0.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/27b91aa254349536320daaae4c74d5e3/cursoradapter-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7f8f5e9e5fa3a961b845c6044177b98d/exifinterface-27.1.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/dc05c35ce9985f7896b73845a95da368/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35e98f176c7337654e1353ab91dbbc1f/documentfile-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e69a5f13345bd2ce943b9fd6f695d932/localbroadcastmanager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/077d2af1d05a4c177a5d01ece05f30b2/print-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/445d10e381f635c467b9c5cfca91a87e/viewmodel-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e266d55146406fe63185265acf1b8526/interpolator-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/778cee53273e330a2bf84b420363970b/livedata-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/98757048d3de64ee204f81b184d81479/livedata-core-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ea1f6890b856070cd3e0145ffc71a465/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/401b8779db25a906a2f3dd86ab05b615/constraint-layout-1.1.3-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9b20ca310a187f541cc98de32b1f0f11/XPopupWindow-1.0.1-api.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/0aa8665d8aa6de5841a341999f5163d3/ealvalog-android-0.5.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.3.50/50ad05ea1c2595fb31b800e76db464d08d599af3/kotlin-stdlib-jdk7-1.3.50.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f5134c0772918548affcaf065deae0fd/anko-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvatag/0.4.3/3c93057202a128c3dfde894b9050d043eb49d908/ealvatag-0.4.3.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a249dc60465ba5c7f474c0004b91bf02/picasso-2.71828-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.10.0/7ef0f1d95bf4c0b3ba30bbae25e0e562b05cf75e/okhttp-3.10.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/2.4.0/7e006aaf475d67f9521f04dcbe8865361300f4f1/okio-jvm-2.4.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/ee596472d1cc236d15750b22fbce466b/anko-sqlite-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/08e57d108e1974cd4ee13e1c1dd90363/anko-sdk27-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d1c6298046675ad2ad2ee13fa618d303/anko-sdk27-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b5c6650c82b87c62b345ef10a3df3457/anko-appcompat-v7-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a84173da99d4e63fc7b8faa4dffa4c45/anko-support-v4-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/40207ece73a52d6ecf6307c1ce6543fe/anko-appcompat-v7-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9f8bae9905534499f4161555cc4501d7/anko-appcompat-v7-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0675d1d1d9234a4aae569de44d639614/anko-support-v4-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/346fd8d1f60ada1920dd392895de76e5/anko-commons-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1856aaafc3c6344e55e431d201d01cda/anko-coroutines-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a22322ee37165904ce4f29fbe6eb534/sqlite-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/c98516fec0d6dd36ae190f2f361ae2c2/platform-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/db6ceff77f22f08d5b9c1eba63b90b53/appcompatV7-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/9a8e1977feabcb7569b70b8072b7c422/supportV4-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8db4cebb001f9102d4174f46ca745a74/commons-base-0.10.8-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-android/1.0.0/2102040565a29061ab7aaea6ea548ad51eafb11d/kotlinx-coroutines-android-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core/1.0.0/a33c4bf7581f71f01d4ed660b09ca199abbb44da/kotlinx-coroutines-core-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.3.50/b529d1738c7e98bbfa36a4134039528f2ce78ebf/kotlin-stdlib-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlinx/kotlinx-coroutines-core-common/1.0.0/5f7551ec1edc068deaa0397100a1f14f32270274/kotlinx-coroutines-core-common-1.0.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.3.50/3d9cd3e1bc7b92e95f43d45be3bfbcf38e36ab87/kotlin-stdlib-common-1.3.50.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/16.0.2/dab5655eb9abe23f2245c34e66c9813c7daf4563/annotations-16.0.2.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/673d07dab8daa3f747cd494ed96abff2/design-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/15c83ac359cebedb0e5d1c5072ce271e/appcompat-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f6815d532e131b720ae3dafcde6bcc84/cardview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68e3837d5c7a91b97f12bd0c5728a6ca/support-v4-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7ab04cbddf45b21558d639a3a81a0db3/support-fragment-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/200405178ccdc6ed1e369ff234d6aaed/animated-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5852be170e76a4d410d0c0a2c58cbc95/recyclerview-v7-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/edb692d396802b49a63fb3caf91e229b/support-core-ui-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68cd55a085b397735614fe283aa8ecf6/support-core-utils-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e0dba30937a80c0b7a6024ef6b1d0e53/support-vector-drawable-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/e09ec085c4c76535c11f42d7112be2a7/support-media-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f46db001c9ac0f5d279b89831d90fe00/transition-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/a61644e6c96342f90bffe439f957fbe6/loader-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/d306809a19251a40d918010de5b8688b/viewpager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/69f3739925400a5765f980c4c6d6b5ba/coordinatorlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/eb8200b39289f44f8cdc8707f5dcd70a/drawerlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0df22f57ce62d438167cd4bd72463436/slidingpanelayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5a45c7466e931501f857337599a9c0ca/customview-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/bc0e7166eb6bf6ff2412fb3b9edaa2ed/swiperefreshlayout-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/68239d0e8764b85b90879f3c504e5e91/asynclayoutinflater-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/7b37ad611628ceeba357896420b6c32f/support-compat-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/99c3927db3b39b26a0a79536efff89fe/versionedparcelable-28.0.0-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/74a575ab2d05088a814c9b13bb9f3c62/cursoradapter-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/8b15463d0c1bd0bfe7475c591b3704a4/exifinterface-27.1.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/1dbc96f7ceb96b172b91926f4b4bbe54/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4804e6111f24f9fc2b3f9c812caef05c/documentfile-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/0d29cefc377a881b026547e331a45f48/localbroadcastmanager-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/328959aee04a4be1a20b789a44a93d11/print-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/f9acd20f99543c3fc193ec28ca86f7dd/viewmodel-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/5fcc5eb04da012eb7d49d621acc8839d/interpolator-28.0.0-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/24bef9872573af4ee64241248edc8a35/livedata-1.1.1-api.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/4a4479d31d2f6054d6e07187dc079ff6/livedata-core-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/35889073e589d83d6c3dd5ba1048e31e/runtime-1.1.1-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/b9f7a64c5f6b009aeacf9d9cf068b45f/constraint-layout-1.1.3-api.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/23.0/c947004bb13d18182be60077ade044099e4f26f1/guava-23.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/1.3.9/40719ea6961c0cb6afaeb6a921eaa1f6afd4cfdf/jsr305-1.3.9.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.0.18/5f65affce1684999e2f4024983835efc3504012e/error_prone_annotations-2.0.18.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.google.j2objc/j2objc-annotations/1.1/ed28ded51a8b1c6b112568def5f4b455e6809019/j2objc-annotations-1.1.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/org.codehaus.mojo/animal-sniffer-annotations/1.14/775b7e22fb10026eed3f86e8dc556dfafe35f2d5/animal-sniffer-annotations-1.14.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog/0.5.0/9ac5b435edc23482abd2815884805352820e4038/ealvalog-0.5.0.jar:/home/brahmix/.gradle/caches/modules-2/files-2.1/com.ealva/ealvalog-core/0.5.0/b218daf48ae873b529c4e865562e6ba1d319be2f/ealvalog-core-0.5.0.jar:/home/brahmix/.gradle/caches/transforms-2/files-2.1/cf353b7e9eb8cfb3ab7d32b7a89422cc/XPopupWindow-1.0.1-api.jar:/home/brahmix/Android/Sdk/platforms/android-29/android.jar:/home/brahmix/Android/Sdk/build-tools/28.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
diff --git a/app/build.gradle b/app/build.gradle
index f6fd9df..15c5a0e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -22,7 +22,6 @@ android {
         externalNativeBuild {
             cmake {
                 arguments "-DANDROID_STL=c++_shared", "-DANDROID=true"
-                cppFlags "-std=c++17"
             }
         }
 
diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
index 8241e50..36e7292 100644
--- a/app/src/main/cpp/CMakeLists.txt
+++ b/app/src/main/cpp/CMakeLists.txt
@@ -21,12 +21,8 @@ set(CMAKE_CXX_STANDARD 17)
 # set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} -g -O0 -std=c++17")
 # set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -O3 -std=c++17 -DNDEBUG")
 
-set (SOURCES
-        Demo.cpp
-)
-
 set (HEADERS
-        Demo.h
+        Demo.hpp
         manager/DirectoryManager.h
         manager/Tok.h
         model/APIInfo.h
@@ -56,7 +52,7 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/3rdparty/SQLiteCpp)
 
 
 add_library(native-lib SHARED
-        ${SOURCES}
+        Demo.cpp
         ${HEADERS}
 )
 
diff --git a/app/src/main/cpp/Demo.cpp b/app/src/main/cpp/Demo.cpp
index cbba3de..6557220 100644
--- a/app/src/main/cpp/Demo.cpp
+++ b/app/src/main/cpp/Demo.cpp
@@ -1,702 +1,16 @@
 //
 // Created by brahmix on 9/26/19.
 //
-#include "Demo.h"
+#include "Demo.hpp"
 
-#include <iostream>
-#include <fstream>
-#include <sstream>
-#include <filesystem>
-#include <cstring>
-#include <jni.h>
-#include <string>
-#include <iomanip>
-#include <sstream>
-#include <vector>
-#include <fcntl.h>
 
-#include <android/asset_manager_jni.h>
-#include <android/log.h>
-#include <android/sharedmem.h>
-#include <curl/curl.h>
-#include <nlohmann/json.hpp>
-#include <sqlite3.h>
-#include <sys/mman.h>
 
-#include "repository/APIRepository.h"
-#include "repository/CoverArtRepository.h"
-#include "repository/RepeatRepository.h"
-#include "repository/ShuffleRepository.h"
-#include "repository/SongRepository.h"
-#include "manager/Tok.h"
-#include "repository/TokenRepository.h"
-#include "repository/UserRepository.h"
 
 
 
-std::vector<model::Song> retrieveSongs(const model::Token& token, const std::string& baseUri)
-{
-    std::vector<model::Song> songs;
-    repository::SongRepository songRepo;
 
-    return songRepo.fetchSongs(token, baseUri);
-}
 
 
-jobject songToObj(JNIEnv *env, const model::Song& song)
-{
-    jclass songClass = env->FindClass( "com/example/mear/models/Song");
-    jmethodID jconstructor = env->GetMethodID( songClass,  "<init>", "()V" );
-    jobject songObj = env->NewObject( songClass, jconstructor );
 
-    jmethodID songId = env->GetMethodID( songClass,  "setId", "(I)V" );
-    jmethodID songTitle = env->GetMethodID( songClass,  "setTitle", "(Ljava/lang/String;)V" );
-    jmethodID songAlbum = env->GetMethodID( songClass,  "setAlbum", "(Ljava/lang/String;)V" );
-    jmethodID songAlbumArtist = env->GetMethodID(songClass, "setAlbumArtist", "(Ljava/lang/String;)V");
-    jmethodID songArtist = env->GetMethodID( songClass,  "setArtist", "(Ljava/lang/String;)V" );
-    jmethodID songGenre = env->GetMethodID( songClass,  "setGenre", "(Ljava/lang/String;)V" );
-    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());
-    jstring album = env->NewStringUTF(song.album.c_str());
-    jstring albumArtist = env->NewStringUTF(song.albumArtist.c_str());
-    jstring artist = env->NewStringUTF(song.artist.c_str());
-    jstring genre = env->NewStringUTF(song.genre.c_str());
-    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);
-    env->CallVoidMethod(songObj, songAlbum, album);
-    env->CallVoidMethod(songObj, songAlbumArtist, albumArtist);
-    env->CallVoidMethod(songObj, songArtist, artist);
-    env->CallVoidMethod(songObj, songGenre, genre);
-    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;
-}
-
-
-std::string jstringToString(JNIEnv *env, jstring& val)
-{
-    return env->GetStringUTFChars(val, nullptr);
-}
-
-
-model::APIInfo retrieveAPIInfo(const std::string& path)
-{
-    repository::local::APIRepository apiRepo;
-
-    return apiRepo.retrieveAPIInfo(path);
-}
-
-
-model::Song retrieveSong(const model::Token& token, const model::Song& song,
-        const std::string& baseUri)
-{
-    repository::SongRepository songRepo;
-
-    return songRepo.retrieveSong(token, song, baseUri);
-}
-
-
-model::Token fetchToken(const model::User& user, const std::string& apiUri)
-{
-    manager::Tok tokMgr;
-    auto token = tokMgr.fetchTokenTrans(user, apiUri);
-
-    return token;
-}
-
-model::Token retrieveSavedToken(const std::string& path)
-{
-    repository::local::TokenRepository tokenRepo;
-    if (!tokenRepo.databaseExist(path)) {
-        tokenRepo.initializedDatabase(path);
-    }
-    auto token = tokenRepo.retrieveToken(path);
-
-    return token;
-}
-
-
-model::User retrieveCredentials(const std::string& dataPath)
-{
-    repository::local::UserRepository userRepo;
-    if (!userRepo.databaseExist(dataPath)) {
-        userRepo.initializedDatabase(dataPath);
-    }
-    auto user = userRepo.retrieveUserCredentials(dataPath);
-
-    return user;
-}
-
-
-int retrieveRepeatMode(const std::string& path)
-{
-    repository::local::RepeatRepository repeatRepo;
-    if (!repeatRepo.databaseExist(path)) {
-        repeatRepo.initializedDatabase(path);
-    }
-    if (!repeatRepo.doesTableExist(path)) {
-        repeatRepo.createRepeatTable(path);
-    }
-
-    auto repeatMode = repeatRepo.retrieveRepeatMode(path);
-
-    return static_cast<int>(repeatMode);
-}
-
-int retrieveShuffleMode(const std::string& path)
-{
-    repository::local::ShuffleRepository shuffleRepo;
-    if (!shuffleRepo.databaseExist(path)) {
-        shuffleRepo.initializedDatabase(path);
-    }
-    if (!shuffleRepo.doesTableExist(path)) {
-        shuffleRepo.createShuffleTable(path);
-    }
-
-    auto shuffleMode = shuffleRepo.retrieveShuffleMode(path);
-
-    return static_cast<int>(shuffleMode);
-}
-
-
-bool doesDatabaseExist(const std::string& dataPath)
-{
-    repository::local::UserRepository userRepo;
-    const auto result = userRepo.databaseExist(dataPath);
-
-    return result;
-}
-
-bool apiInformationExist(const std::string& dataPath)
-{
-    repository::local::APIRepository apiRepo;
-
-    return apiRepo.isTableEmpty(dataPath);
-}
-
-bool doesTokenExist(const std::string& dataPath)
-{
-    repository::local::TokenRepository tokenRepo;
-
-    return tokenRepo.isTableEmpty(dataPath);
-}
-
-bool userCredentialExist(const std::string& dataPath)
-{
-    repository::local::UserRepository userRepo;
-
-    return userRepo.isTableEmpty(dataPath);
-}
-
-
-void saveAPIInfo(const model::APIInfo& apiInfo, const std::string& path)
-{
-    repository::local::APIRepository apiRepo;
-    if (!apiRepo.databaseExist(path)) {
-        apiRepo.initializedDatabase(path);
-    }
-    if (!apiRepo.doesTableExist(path)) {
-        apiRepo.createAPiInfoTable(path);
-    }
-    if (!apiRepo.isTableEmpty(path)) {
-        apiRepo.deleteAPIInfo(apiInfo, path);
-    }
-
-    apiRepo.saveAPIInfo(apiInfo, path);
-}
-
-void saveCredentials(const model::User& user, const std::string& appDirectory)
-{
-    repository::local::UserRepository userRepo;
-
-    if (!userRepo.databaseExist(appDirectory)) {
-        userRepo.initializedDatabase(appDirectory);
-    }
-    if (!userRepo.doesTableExist(appDirectory)) {
-        userRepo.createUserTable(appDirectory);
-    }
-
-    if (!userRepo.isTableEmpty(appDirectory)) {
-        userRepo.deleteUserTable(appDirectory);
-    }
-
-    userRepo.saveUserCred(user, appDirectory);
-}
-
-void saveToken(const model::Token& token, const std::string& path)
-{
-    repository::local::TokenRepository tokenRepo;
-    if (!tokenRepo.databaseExist(path)) {
-        tokenRepo.initializedDatabase(path);
-    }
-    if (!tokenRepo.doesTableExist(path)) {
-        tokenRepo.createTokenTable(path);
-    }
-    if (!tokenRepo.isTableEmpty(path)) {
-        tokenRepo.deleteRecord(path);
-    }
-
-    tokenRepo.saveToken(token, path);
-}
-
-void updateRepeatMode(const std::string& path)
-{
-    repository::local::RepeatRepository repeatRepo;
-    if (!repeatRepo.databaseExist(path)) {
-        repeatRepo.initializedDatabase(path);
-    }
-    repeatRepo.updateRepeat(path);
-}
-
-void updateShuffleMode(const std::string& path)
-{
-    repository::local::ShuffleRepository shuffleRepo;
-    if (!shuffleRepo.databaseExist(path)) {
-        shuffleRepo.initializedDatabase(path);
-    }
-    shuffleRepo.updateShuffle(path);
-}
-
-
-extern "C"
-JNIEXPORT jobjectArray
-JNICALL
-Java_com_example_mear_repositories_TrackRepository_retrieveSongs(
-        JNIEnv *env,
-        jobject thisOnj,
-        jobject token,
-        jstring baseUri
-        ) {
-    jclass tokenClass = env->FindClass("com/example/mear/models/Token");
-    jclass songClass = env->FindClass( "com/example/mear/models/Song");
-
-    auto tokField = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
-    auto tokObj = env->GetObjectField(token, tokField);
-    std::string tokStr = env->GetStringUTFChars((jstring)tokObj, nullptr);
-    model::Token tk(tokStr);
-
-    const std::string uri = env->GetStringUTFChars(baseUri, nullptr);
-
-    auto allSongs = retrieveSongs(tk, uri);
-    jobjectArray songs = env->NewObjectArray(allSongs.size(), songClass, nullptr);
-    for (auto i = 0; i != allSongs.size(); ++i) {
-        try {
-            auto song = songToObj(env, allSongs[i]);
-            env->SetObjectArrayElement(songs, i, song);
-        } catch (std::exception& ex) {
-            auto msg = ex.what();
-        }
-    }
-
-    auto curPath = "/data/data/com.example.mear/";
-    std::string filename;
-    std::string currPathStr(curPath);
-    std::fstream tmp;
-    if (currPathStr.at(currPathStr.size() - 1) == '/') {
-        filename.assign(currPathStr);
-    } else {
-        filename.assign(currPathStr);
-        filename.append("/");
-    }
-    filename.append("test.txt");
-    tmp.open(filename.c_str(), std::ios::out);
-    auto content = "hello fs";
-    tmp.write(content, std::strlen(content));
-    tmp.close();
-
-    return songs;
-}
-
-
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_APIRepository_retrieveAPIInfoRecord(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr ) {
-    const auto path = env->GetStringUTFChars(pathStr, nullptr);
-
-    auto apiInfo = retrieveAPIInfo(path);
-
-    jclass apiInfoClass = env->FindClass( "com/example/mear/models/APIInfo");
-    jmethodID jconstructor = env->GetMethodID( apiInfoClass,  "<init>", "()V" );
-    jobject apiInfoObj = env->NewObject( apiInfoClass, jconstructor );
-
-    jmethodID uriId = env->GetMethodID( apiInfoClass,  "setUri", "(Ljava/lang/String;)V" );
-    jmethodID versionId = env->GetMethodID( apiInfoClass,  "setVersion", "(I)V" );
-
-    jint versionVal = apiInfo.version;
-    jstring uriVal = env->NewStringUTF(apiInfo.uri.c_str());
-
-    env->CallVoidMethod(apiInfoObj, uriId, uriVal);
-    env->CallVoidMethod( apiInfoObj, versionId, versionVal);
-
-    return apiInfoObj;
-}
-
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_TokenRepository_retrieveTokenRecord(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto path = env->GetStringUTFChars(pathStr, nullptr);
-    auto token = retrieveSavedToken(path);
-
-    auto tokenClass = env->FindClass("com/example/mear/models/Token");
-    auto jConstructor = env->GetMethodID(tokenClass, "<init>", "()V");
-    auto tokenObj = env->NewObject(tokenClass, jConstructor);
-
-    auto accessTokenId = env->GetMethodID(tokenClass, "setAccessToken", "(Ljava/lang/String;)V");
-
-    auto accessTokenStr = env->NewStringUTF(token.accessToken.c_str());
-
-    env->CallVoidMethod(tokenObj, accessTokenId, accessTokenStr);
-
-    return tokenObj;
-}
-
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_TrackRepository_retrieveSong(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject tokenObj,
-        jobject songObj,
-        jstring uriStr
-        ) {
-    auto tokenClass = env->GetObjectClass(tokenObj);
-    auto songClass = env->GetObjectClass(songObj);
-
-    auto accessTokenField = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
-    auto idField = env->GetFieldID(songClass, "id", "I");
-
-    auto accessTokenStr = (jstring)env->GetObjectField(tokenObj, accessTokenField);
-    auto idInt = env->GetIntField(songObj, idField);
-
-    auto uri = env->GetStringUTFChars(uriStr, nullptr);
-    model::Token token(env->GetStringUTFChars(accessTokenStr, nullptr));
-    model::Song song(idInt);
-
-    song = retrieveSong(token, song, uri);
-    auto fetchedSongObj = songToObj(env, song);
-
-    return fetchedSongObj;
-}
-
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_UserRepository_retrieveUserCredentials(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring dataPath
-) {
-    jclass userClass = env->FindClass("com/example/mear/models/User");
-    jmethodID userContructor = env->GetMethodID(userClass, "<init>", "()V");
-    jobject userObj = env->NewObject(userClass, userContructor);
-
-    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
-    auto user = retrieveCredentials(dataPathStr);
-
-    jmethodID usernameId = env->GetMethodID(userClass, "setUsername", "(Ljava/lang/String;)V");
-    jmethodID passwordId = env->GetMethodID(userClass, "setPassword", "(Ljava/lang/String;)V");
-
-    jstring username = env->NewStringUTF(user.username.c_str());
-    jstring password = env->NewStringUTF(user.password.c_str());
-
-    env->CallVoidMethod(userObj, usernameId, username);
-    env->CallVoidMethod(userObj, passwordId, password);
-
-    return userObj;
-}
-
-extern "C"
-JNIEXPORT jobject
-JNICALL
-Java_com_example_mear_repositories_UserRepository_logUser(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject user,
-        jstring apiUri ) {
-    jclass userClass = env->GetObjectClass(user);
-    auto passwordField = env->GetFieldID(userClass, "password", "Ljava/lang/String;");
-    auto usernameField = env->GetFieldID(userClass, "username", "Ljava/lang/String;");
-
-    auto password = (jstring)env->GetObjectField(user, passwordField);
-    auto username = (jstring)env->GetObjectField(user, usernameField);
-
-    const std::string api = env->GetStringUTFChars(apiUri, nullptr);
-    model::User us(env->GetStringUTFChars(username, nullptr),
-            env->GetStringUTFChars(password, nullptr));
-
-    auto token = fetchToken(us, api);
-
-    jclass tokenClass = env->FindClass( "com/example/mear/models/Token");
-    jmethodID jconstructor = env->GetMethodID( tokenClass,  "<init>", "()V" );
-    jobject tokenObj = env->NewObject( tokenClass, jconstructor );
-
-    jmethodID tokenAccess = env->GetMethodID( tokenClass,  "setAccessToken", "(Ljava/lang/String;)V" );
-
-    jstring title = env->NewStringUTF(token.accessToken.c_str());
-
-    env->CallVoidMethod(tokenObj, tokenAccess, title);
-
-    return tokenObj;
-}
-
-
-extern "C"
-JNIEXPORT jbyteArray
-JNICALL
-Java_com_example_mear_repositories_CoverArtRepository_retrieveCoverArtImage(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject tokenObj,
-        jobject coverArt,
-        jstring apiUri
-        ) {
-    jclass coverArtClass = env->GetObjectClass(coverArt);
-    auto idField = env->GetFieldID(coverArtClass, "id", "I");
-    auto titleField = env->GetFieldID(coverArtClass, "title", "Ljava/lang/String;");
-    auto id = env->GetIntField(coverArt, idField);
-    auto title = (jstring)env->GetObjectField(coverArt, titleField);
-
-    jclass tokenClass = env->GetObjectClass(tokenObj);
-    auto accessTokenId = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
-    auto accessTokenVal = (jstring) env->GetObjectField(tokenObj, accessTokenId);
-
-    model::Token token;
-    token.accessToken = env->GetStringUTFChars(accessTokenVal, nullptr);
-
-    model::CoverArt cover(id, env->GetStringUTFChars(title, nullptr));
-    repository::CoverArtRepository<model::CoverArt> coverArtRepo;
-    auto data = coverArtRepo.retrieveCoverArtData(token, cover, env->GetStringUTFChars(apiUri, nullptr));
-
-    jbyteArray image = env->NewByteArray(data.size());
-    env->SetByteArrayRegion(image, 0, data.size(), (jbyte*) data.data());
-
-    return image;
-}
-
-
-extern "C"
-JNIEXPORT jint
-JNICALL
-Java_com_example_mear_repositories_RepeatRepository_retrieveRepeatMode(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = jstringToString(env, pathStr);
-    auto repeatMode = retrieveRepeatMode(dataPath);
-
-    return repeatMode;
-}
-
-extern "C"
-JNIEXPORT jint
-JNICALL
-Java_com_example_mear_repositories_ShuffleRepository_retrieveShuffleMode(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = jstringToString(env, pathStr);
-    auto shuffleMode = retrieveShuffleMode(dataPath);
-
-    return shuffleMode;
-}
-
-
-extern "C"
-JNIEXPORT jboolean
-JNICALL
-Java_com_example_mear_repositories_APIRepository_isAPIInfoTableEmpty(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = env->GetStringUTFChars(pathStr, nullptr);
-
-    return apiInformationExist(dataPath);
-}
-
-extern "C"
-JNIEXPORT jboolean
-JNICALL
-Java_com_example_mear_repositories_TokenRepository_isTokenTableEmpty(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = env->GetStringUTFChars(pathStr, nullptr);
-
-    return doesTokenExist(dataPath);
-}
-
-extern "C"
-JNIEXPORT jboolean
-JNICALL
-Java_com_example_mear_repositories_UserRepository_isUserTableEmpty(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring dataPath
-        ) {
-    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
-
-    return userCredentialExist(dataPathStr);
-}
-
-extern "C"
-JNIEXPORT jboolean
-JNICALL
-Java_com_example_mear_repositories_BaseRepository_doesDatabaseExist(
-        JNIEnv *env,
-        jobject thidObj,
-        jstring dataPath
-        ) {
-    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
-    jboolean result = doesDatabaseExist(dataPathStr);
-
-    return result;
-}
-
-
-extern "C"
-JNIEXPORT void
-JNICALL
-Java_com_example_mear_repositories_UserRepository_saveUserCredentials(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject user,
-        jstring appDirectory
-) {
-    jclass userClass = env->GetObjectClass(user);
-    auto usernameId = env->GetFieldID(userClass, "username", "Ljava/lang/String;");
-    auto passwordId = env->GetFieldID(userClass, "password", "Ljava/lang/String;");
-
-    auto usernameStr = (jstring) env->GetObjectField(user, usernameId);
-    auto passwordStr = (jstring) env->GetObjectField(user, passwordId);
-
-    const std::string username = env->GetStringUTFChars(usernameStr, nullptr);
-    const std::string password = env->GetStringUTFChars(passwordStr, nullptr);
-    const std::string appDirectoryStr = env->GetStringUTFChars(appDirectory, nullptr);
-
-    model::User usr(username, password);
-
-    saveCredentials(usr, appDirectoryStr);
-}
-
-extern "C"
-JNIEXPORT void
-JNICALL
-Java_com_example_mear_repositories_APIRepository_saveAPIInfoRecord(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject apiInfoObj,
-        jstring pathStr
-        ) {
-    auto apiInfoClass = env->GetObjectClass(apiInfoObj);
-    auto uriId = env->GetFieldID(apiInfoClass, "uri", "Ljava/lang/String;");
-    auto versionId = env->GetFieldID(apiInfoClass, "version", "I");
-
-    auto uriStr = (jstring) env->GetObjectField(apiInfoObj, uriId);
-    auto versionInt = env->GetIntField(apiInfoObj, versionId);
-
-    model::APIInfo apiInfo(env->GetStringUTFChars(uriStr, nullptr), versionInt);
-    auto path = env->GetStringUTFChars(pathStr, nullptr);
-
-    saveAPIInfo(apiInfo, path);
-}
-
-extern "C"
-JNIEXPORT void
-JNICALL
-Java_com_example_mear_repositories_TokenRepository_saveTokenRecord(
-        JNIEnv *env,
-        jobject thisObj,
-        jobject tokenObj,
-        jstring pathStr
-        ) {
-    auto tokenClass = env->GetObjectClass(tokenObj);
-    auto accessTokenId = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
-
-    auto accessTokenVal = (jstring) env->GetObjectField(tokenObj, accessTokenId);
-
-    model::Token token(env->GetStringUTFChars(accessTokenVal, nullptr));
-    auto path = env->GetStringUTFChars(pathStr, nullptr);
-
-    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
-Java_com_example_mear_repositories_RepeatRepository_updateRepeatMode(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = jstringToString(env, pathStr);
-    updateRepeatMode(dataPath);
-}
-
-extern "C"
-JNIEXPORT void
-JNICALL
-Java_com_example_mear_repositories_ShuffleRepository_updateShuffle(
-        JNIEnv *env,
-        jobject thisObj,
-        jstring pathStr
-        ) {
-    const auto dataPath = jstringToString(env, pathStr);
-    updateShuffleMode(dataPath);
-}
\ No newline at end of file
diff --git a/app/src/main/cpp/Demo.h b/app/src/main/cpp/Demo.h
deleted file mode 100644
index ee52dfa..0000000
--- a/app/src/main/cpp/Demo.h
+++ /dev/null
@@ -1,80 +0,0 @@
-//
-// Created by brahmix on 10/12/19.
-//
-
-#ifndef MEAR_DEMO_H
-#define MEAR_DEMO_H
-
-#include <iostream>
-
-#include <jni.h>
-
-#include "model/APIInfo.h"
-#include "model/CoverArt.h"
-#include "model/Song.h"
-#include "model/Token.h"
-#include "model/User.h"
-
-
-std::vector<model::Song> retrieveSongs(const model::Token&, const std::string&);
-
-jobject songToObj(JNIEnv *env, const model::Song&);
-
-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&);
-model::Token retrieveSavedToken(const std::string&);
-
-model::User retrieveCredentials(const std::string&);
-
-int retrieveRepeatMode(const std::string&);
-int retrieveShuffleMode(const std::string&);
-
-bool doesDatabaseExist(const std::string&);
-bool apiInformationExist(const std::string&);
-bool doesTokenExist(const std::string&);
-bool userCredentialExist(const std::string&);
-
-void saveAPIInfo(const model::APIInfo&, const std::string&);
-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) {
-
-}
-
-
-
-#endif //MEAR_DEMO_H
diff --git a/app/src/main/cpp/Demo.hpp b/app/src/main/cpp/Demo.hpp
new file mode 100644
index 0000000..a4e27a7
--- /dev/null
+++ b/app/src/main/cpp/Demo.hpp
@@ -0,0 +1,714 @@
+//
+// Created by brahmix on 10/12/19.
+//
+
+#ifndef MEAR_DEMO_H
+#define MEAR_DEMO_H
+
+#include <iostream>
+#include <string>
+#include <cstring>
+
+#include <android/asset_manager_jni.h>
+#include <android/log.h>
+#include <android/sharedmem.h>
+#include <fcntl.h>
+#include <jni.h>
+#include <nlohmann/json.hpp>
+#include <sys/mman.h>
+
+#include "manager/Tok.h"
+#include "model/APIInfo.h"
+#include "model/CoverArt.h"
+#include "model/Song.h"
+#include "model/Token.h"
+#include "model/User.h"
+#include "repository/APIRepository.h"
+#include "repository/CoverArtRepository.h"
+#include "repository/RepeatRepository.h"
+#include "repository/ShuffleRepository.h"
+#include "repository/SongRepository.h"
+#include "repository/TokenRepository.h"
+#include "repository/UserRepository.h"
+
+
+template<class Song = model::Song>
+std::vector<Song> retrieveSongs(const model::Token& token, const std::string& baseUri) {
+    std::vector<model::Song> songs;
+    repository::SongRepository songRepo;
+
+    return songRepo.fetchSongs(token, baseUri);
+}
+
+template<typename Str = std::string>
+Str jstringToString(JNIEnv *env, jstring& val) {
+    auto myVal = env->GetStringUTFChars(val, nullptr);
+    return myVal;
+}
+
+template<class APIInfo = model::APIInfo>
+APIInfo retrieveAPIInfo(const std::string& path) {
+    repository::local::APIRepository apiRepo;
+
+    return apiRepo.retrieveAPIInfo(path);
+}
+
+template<typename SongObj, typename JE, class Song = model::Song>
+Song ObjToSong(JE *env, SongObj obj) {
+    jclass songClass = env->GetObjectClass(obj);
+
+    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", "Z");
+
+    auto titleVal = (jstring)env->GetObjectField(obj, songTitle);
+    auto albumVal = (jstring)env->GetObjectField(obj, songAlbum);
+    auto albumArtistVal = (jstring)env->GetObjectField(obj, songAlbumArtist);
+    auto songArtistVal = (jstring)env->GetObjectField(obj, songArtist);
+    auto songGenreVal = (jstring)env->GetObjectField(obj, songGenre);
+    auto songDurationVal = env->GetIntField(obj, songDuration);
+    auto songYearVal = env->GetIntField(obj, songYear);
+    auto songCoverArtIdVal = env->GetIntField(obj, songCoverArtId);
+    auto songPathVal = (jstring)env->GetObjectField(obj, songPathId);
+    auto songFilenameVal = (jstring)env->GetObjectField(obj, songFilenameId);
+
+
+    Song song;
+    song.title = env->GetStringUTFChars(titleVal, nullptr);
+    song.artist = env->GetStringUTFChars(songArtistVal, nullptr);
+    song.album = env->GetStringUTFChars(albumVal, nullptr);
+    song.albumArtist = env->GetStringUTFChars(albumArtistVal, nullptr);
+    song.genre = env->GetStringUTFChars(songGenreVal, nullptr);
+    song.duration = songDurationVal;
+    song.year = songYearVal;
+    song.coverArtId = songCoverArtIdVal;
+    song.path = env->GetStringUTFChars(songPathVal, nullptr);
+    song.filename = env->GetStringUTFChars(songFilenameVal, nullptr);
+
+    return song;
+}
+
+template<class Song = model::Song>
+Song retrieveSong(const model::Token& token, const Song& song,
+                         const std::string& baseUri) {
+    repository::SongRepository songRepo;
+
+    return songRepo.retrieveSong(token, song, baseUri);
+}
+
+template<class Token = model::Token>
+Token fetchToken(const model::User& user, const std::string& apiUri) {
+    manager::Tok tokMgr;
+    auto token = tokMgr.fetchTokenTrans(user, apiUri);
+
+    return token;
+}
+template<class Token = model::Token>
+Token retrieveSavedToken(const std::string& path) {
+    repository::local::TokenRepository tokenRepo;
+    if (!tokenRepo.databaseExist(path)) {
+        tokenRepo.initializedDatabase(path);
+    }
+    auto token = tokenRepo.retrieveToken(path);
+
+    return token;
+}
+
+template<class User = model::User>
+User retrieveCredentials(const std::string& dataPath) {
+    repository::local::UserRepository userRepo;
+    if (!userRepo.databaseExist(dataPath)) {
+        userRepo.initializedDatabase(dataPath);
+    }
+    auto user = userRepo.retrieveUserCredentials(dataPath);
+
+    return user;
+}
+
+
+int retrieveRepeatMode(const std::string& path) {
+    repository::local::RepeatRepository repeatRepo;
+    if (!repeatRepo.databaseExist(path)) {
+        repeatRepo.initializedDatabase(path);
+    }
+    if (!repeatRepo.doesTableExist(path)) {
+        repeatRepo.createRepeatTable(path);
+    }
+
+    auto repeatMode = repeatRepo.retrieveRepeatMode(path);
+
+    return static_cast<int>(repeatMode);
+}
+
+int retrieveShuffleMode(const std::string& path) {
+    repository::local::ShuffleRepository shuffleRepo;
+    if (!shuffleRepo.databaseExist(path)) {
+        shuffleRepo.initializedDatabase(path);
+    }
+    if (!shuffleRepo.doesTableExist(path)) {
+        shuffleRepo.createShuffleTable(path);
+    }
+
+    auto shuffleMode = shuffleRepo.retrieveShuffleMode(path);
+
+    return static_cast<int>(shuffleMode);
+}
+
+
+bool doesDatabaseExist(const std::string& dataPath) {
+    repository::local::UserRepository userRepo;
+    const auto result = userRepo.databaseExist(dataPath);
+
+    return result;
+}
+
+bool apiInformationExist(const std::string& dataPath) {
+    repository::local::APIRepository apiRepo;
+
+    return apiRepo.isTableEmpty(dataPath);
+}
+
+bool doesTokenExist(const std::string& dataPath) {
+    repository::local::TokenRepository tokenRepo;
+
+    return tokenRepo.isTableEmpty(dataPath);
+}
+
+bool userCredentialExist(const std::string& dataPath) {
+    repository::local::UserRepository userRepo;
+
+    return userRepo.isTableEmpty(dataPath);
+}
+
+
+void saveAPIInfo(const model::APIInfo& apiInfo, const std::string& path) {
+    repository::local::APIRepository apiRepo;
+    if (!apiRepo.databaseExist(path)) {
+        apiRepo.initializedDatabase(path);
+    }
+    if (!apiRepo.doesTableExist(path)) {
+        apiRepo.createAPiInfoTable(path);
+    }
+    if (!apiRepo.isTableEmpty(path)) {
+        apiRepo.deleteAPIInfo(apiInfo, path);
+    }
+
+    apiRepo.saveAPIInfo(apiInfo, path);
+}
+
+void saveCredentials(const model::User& user, const std::string& appDirectory) {
+    repository::local::UserRepository userRepo;
+
+    if (!userRepo.databaseExist(appDirectory)) {
+        userRepo.initializedDatabase(appDirectory);
+    }
+    if (!userRepo.doesTableExist(appDirectory)) {
+        userRepo.createUserTable(appDirectory);
+    }
+
+    if (!userRepo.isTableEmpty(appDirectory)) {
+        userRepo.deleteUserTable(appDirectory);
+    }
+
+    userRepo.saveUserCred(user, appDirectory);
+}
+
+void saveToken(const model::Token& token, const std::string& path) {
+    repository::local::TokenRepository tokenRepo;
+    if (!tokenRepo.databaseExist(path)) {
+        tokenRepo.initializedDatabase(path);
+    }
+    if (!tokenRepo.doesTableExist(path)) {
+        tokenRepo.createTokenTable(path);
+    }
+    if (!tokenRepo.isTableEmpty(path)) {
+        tokenRepo.deleteRecord(path);
+    }
+
+    tokenRepo.saveToken(token, path);
+}
+
+void updateRepeatMode(const std::string& path) {
+    repository::local::RepeatRepository repeatRepo;
+    if (!repeatRepo.databaseExist(path)) {
+        repeatRepo.initializedDatabase(path);
+    }
+    repeatRepo.updateRepeat(path);
+}
+
+void updateShuffleMode(const std::string& path) {
+    repository::local::ShuffleRepository shuffleRepo;
+    if (!shuffleRepo.databaseExist(path)) {
+        shuffleRepo.initializedDatabase(path);
+    }
+    shuffleRepo.updateShuffle(path);
+}
+
+template<class Song = model::Song, class Token = model::Token, typename Str = std::string>
+void downloadSong(Song& song, const Token& token, const Str& path) {
+    repository::SongRepository songRepo;
+    // songRepo.downloadSong();
+}
+
+
+template<class Song = model::Song>
+jobject songToObj(JNIEnv *env, const Song& song) {
+    jclass songClass = env->FindClass( "com/example/mear/models/Song");
+    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 songYear = env->GetFieldID( songClass,  "year", "I" );
+    auto songDuration = env->GetFieldID( songClass,  "duration", "I" );
+    auto songCoverArtId = env->GetFieldID(songClass, "coverArtId", "I");
+    auto songDownloadedId = env->GetFieldID(songClass, "downloaded", "Z");
+    auto songPathId = env->GetFieldID(songClass, "path", "Ljava/lang/String;");
+    auto songFilenameId = env->GetFieldID(songClass, "filename", "Ljava/lang/String;");
+
+    auto songPath = (song.path.empty()) ? nullptr : env->NewStringUTF(song.path.c_str());
+    auto songFilename = (song.filename.empty()) ? nullptr : env->NewStringUTF(song.filename.c_str());
+
+    env->SetIntField(songObj, songId, song.id);
+    env->SetObjectField(songObj, songTitle, env->NewStringUTF(song.title.c_str()));
+    env->SetObjectField(songObj, songAlbum, env->NewStringUTF(song.album.c_str()));
+    env->SetObjectField(songObj, songAlbumArtist, env->NewStringUTF(song.albumArtist.c_str()));
+    env->SetObjectField(songObj, songArtist, env->NewStringUTF(song.artist.c_str()));
+    env->SetObjectField(songObj, songGenre, env->NewStringUTF(song.genre.c_str()));
+    env->SetIntField(songObj, songYear, song.year);
+    env->SetIntField(songObj, songDuration, song.duration);
+    env->SetIntField(songObj, songCoverArtId, song.coverArtId);
+    env->SetBooleanField(songObj, songDownloadedId, song.downloaded);
+    env->SetObjectField(songObj, songPathId, songPath);
+    env->SetObjectField(songObj, songFilenameId, songFilename);
+
+    env->DeleteLocalRef(songPath);
+    env->DeleteLocalRef(songFilename);
+
+    return songObj;
+}
+
+
+extern "C"
+JNIEXPORT jobjectArray
+JNICALL
+Java_com_example_mear_repositories_TrackRepository_retrieveSongs(
+        JNIEnv *env,
+        jobject thisOnj,
+        jobject token,
+        jstring baseUri
+) {
+    jclass tokenClass = env->FindClass("com/example/mear/models/Token");
+    jclass songClass = env->FindClass( "com/example/mear/models/Song");
+
+    auto tokField = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
+    auto tokObj = env->GetObjectField(token, tokField);
+    std::string tokStr = env->GetStringUTFChars((jstring)tokObj, nullptr);
+    model::Token tk(tokStr);
+
+    const std::string uri = env->GetStringUTFChars(baseUri, nullptr);
+    env->DeleteLocalRef(baseUri);
+
+    auto allSongs = retrieveSongs(tk, uri);
+    jobjectArray songs = env->NewObjectArray(allSongs.size(), songClass, nullptr);
+    auto i = 0;
+    for (auto& sng: allSongs) {
+        try {
+            auto song = songToObj<model::Song>(env, sng);
+            env->SetObjectArrayElement(songs, i++, song);
+        } catch (std::exception& ex) {
+            auto msg = ex.what();
+        }
+    }
+
+    return songs;
+}
+
+
+extern "C"
+JNIEXPORT jbyteArray
+JNICALL
+Java_com_example_mear_repositories_CoverArtRepository_retrieveCoverArtImage(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject tokenObj,
+        jobject coverArt,
+        jstring apiUri
+) {
+    jclass coverArtClass = env->GetObjectClass(coverArt);
+    auto idField = env->GetFieldID(coverArtClass, "id", "I");
+    auto titleField = env->GetFieldID(coverArtClass, "title", "Ljava/lang/String;");
+    auto id = env->GetIntField(coverArt, idField);
+    auto title = (jstring)env->GetObjectField(coverArt, titleField);
+
+    jclass tokenClass = env->GetObjectClass(tokenObj);
+    auto accessTokenId = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
+    auto accessTokenVal = (jstring) env->GetObjectField(tokenObj, accessTokenId);
+
+    model::Token token;
+    token.accessToken = env->GetStringUTFChars(accessTokenVal, nullptr);
+
+    model::CoverArt cover(id, env->GetStringUTFChars(title, nullptr));
+    repository::CoverArtRepository<model::CoverArt> coverArtRepo;
+    auto data = coverArtRepo.retrieveCoverArtData(token, cover, env->GetStringUTFChars(apiUri, nullptr));
+
+    jbyteArray image = env->NewByteArray(data.size());
+    env->SetByteArrayRegion(image, 0, data.size(), (jbyte*) data.data());
+
+    return image;
+}
+
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_repositories_APIRepository_retrieveAPIInfoRecord(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr ) {
+    const auto path = env->GetStringUTFChars(pathStr, nullptr);
+
+    auto apiInfo = retrieveAPIInfo(path);
+
+    jclass apiInfoClass = env->FindClass( "com/example/mear/models/APIInfo");
+    jmethodID jconstructor = env->GetMethodID( apiInfoClass,  "<init>", "()V" );
+    jobject apiInfoObj = env->NewObject( apiInfoClass, jconstructor );
+
+    jmethodID uriId = env->GetMethodID( apiInfoClass,  "setUri", "(Ljava/lang/String;)V" );
+    jmethodID versionId = env->GetMethodID( apiInfoClass,  "setVersion", "(I)V" );
+
+    jint versionVal = apiInfo.version;
+    jstring uriVal = env->NewStringUTF(apiInfo.uri.c_str());
+
+    env->CallVoidMethod(apiInfoObj, uriId, uriVal);
+    env->CallVoidMethod( apiInfoObj, versionId, versionVal);
+
+    return apiInfoObj;
+}
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_repositories_TokenRepository_retrieveTokenRecord(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto path = env->GetStringUTFChars(pathStr, nullptr);
+    auto token = retrieveSavedToken(path);
+
+    auto tokenClass = env->FindClass("com/example/mear/models/Token");
+    auto jConstructor = env->GetMethodID(tokenClass, "<init>", "()V");
+    auto tokenObj = env->NewObject(tokenClass, jConstructor);
+
+    auto accessTokenId = env->GetMethodID(tokenClass, "setAccessToken", "(Ljava/lang/String;)V");
+
+    auto accessTokenStr = env->NewStringUTF(token.accessToken.c_str());
+
+    env->CallVoidMethod(tokenObj, accessTokenId, accessTokenStr);
+
+    return tokenObj;
+}
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_repositories_TrackRepository_retrieveSong(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject tokenObj,
+        jobject songObj,
+        jstring uriStr
+) {
+    auto tokenClass = env->GetObjectClass(tokenObj);
+    auto songClass = env->GetObjectClass(songObj);
+
+    auto accessTokenField = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
+    auto idField = env->GetFieldID(songClass, "id", "I");
+
+    auto accessTokenStr = (jstring)env->GetObjectField(tokenObj, accessTokenField);
+    auto idInt = env->GetIntField(songObj, idField);
+
+    auto uri = env->GetStringUTFChars(uriStr, nullptr);
+    model::Token token(env->GetStringUTFChars(accessTokenStr, nullptr));
+    model::Song song(idInt);
+
+    song = retrieveSong(token, song, uri);
+    auto fetchedSongObj = songToObj(env, song);
+
+    return fetchedSongObj;
+}
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_repositories_UserRepository_retrieveUserCredentials(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring dataPath
+) {
+    jclass userClass = env->FindClass("com/example/mear/models/User");
+    jmethodID userContructor = env->GetMethodID(userClass, "<init>", "()V");
+    jobject userObj = env->NewObject(userClass, userContructor);
+
+    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
+    auto user = retrieveCredentials(dataPathStr);
+
+    jmethodID usernameId = env->GetMethodID(userClass, "setUsername", "(Ljava/lang/String;)V");
+    jmethodID passwordId = env->GetMethodID(userClass, "setPassword", "(Ljava/lang/String;)V");
+
+    jstring username = env->NewStringUTF(user.username.c_str());
+    jstring password = env->NewStringUTF(user.password.c_str());
+
+    env->CallVoidMethod(userObj, usernameId, username);
+    env->CallVoidMethod(userObj, passwordId, password);
+
+    return userObj;
+}
+
+extern "C"
+JNIEXPORT jobject
+JNICALL
+Java_com_example_mear_repositories_UserRepository_logUser(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject user,
+        jstring apiUri ) {
+    jclass userClass = env->GetObjectClass(user);
+    auto passwordField = env->GetFieldID(userClass, "password", "Ljava/lang/String;");
+    auto usernameField = env->GetFieldID(userClass, "username", "Ljava/lang/String;");
+
+    auto password = (jstring)env->GetObjectField(user, passwordField);
+    auto username = (jstring)env->GetObjectField(user, usernameField);
+
+    const std::string api = env->GetStringUTFChars(apiUri, nullptr);
+    model::User us(env->GetStringUTFChars(username, nullptr),
+                   env->GetStringUTFChars(password, nullptr));
+
+    auto token = fetchToken(us, api);
+
+    jclass tokenClass = env->FindClass( "com/example/mear/models/Token");
+    jmethodID jconstructor = env->GetMethodID( tokenClass,  "<init>", "()V" );
+    jobject tokenObj = env->NewObject( tokenClass, jconstructor );
+
+    jmethodID tokenAccess = env->GetMethodID( tokenClass,  "setAccessToken", "(Ljava/lang/String;)V" );
+
+    jstring title = env->NewStringUTF(token.accessToken.c_str());
+
+    env->CallVoidMethod(tokenObj, tokenAccess, title);
+
+    return tokenObj;
+}
+
+
+extern "C"
+JNIEXPORT jint
+JNICALL
+Java_com_example_mear_repositories_RepeatRepository_retrieveRepeatMode(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = jstringToString(env, pathStr);
+    auto repeatMode = retrieveRepeatMode(dataPath);
+
+    return repeatMode;
+}
+
+extern "C"
+JNIEXPORT jint
+JNICALL
+Java_com_example_mear_repositories_ShuffleRepository_retrieveShuffleMode(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = jstringToString(env, pathStr);
+    auto shuffleMode = retrieveShuffleMode(dataPath);
+
+    return shuffleMode;
+}
+
+
+extern "C"
+JNIEXPORT jboolean
+JNICALL
+Java_com_example_mear_repositories_APIRepository_isAPIInfoTableEmpty(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = env->GetStringUTFChars(pathStr, nullptr);
+
+    return apiInformationExist(dataPath);
+}
+
+extern "C"
+JNIEXPORT jboolean
+JNICALL
+Java_com_example_mear_repositories_BaseRepository_doesDatabaseExist(
+        JNIEnv *env,
+        jobject thidObj,
+        jstring dataPath
+) {
+    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
+    jboolean result = doesDatabaseExist(dataPathStr);
+
+    return result;
+}
+
+extern "C"
+JNIEXPORT jboolean
+JNICALL
+Java_com_example_mear_repositories_TokenRepository_isTokenTableEmpty(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = env->GetStringUTFChars(pathStr, nullptr);
+
+    return doesTokenExist(dataPath);
+}
+
+extern "C"
+JNIEXPORT jboolean
+JNICALL
+Java_com_example_mear_repositories_UserRepository_isUserTableEmpty(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring dataPath
+) {
+    const std::string dataPathStr = env->GetStringUTFChars(dataPath, nullptr);
+
+    return userCredentialExist(dataPathStr);
+}
+
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_APIRepository_saveAPIInfoRecord(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject apiInfoObj,
+        jstring pathStr
+) {
+    auto apiInfoClass = env->GetObjectClass(apiInfoObj);
+    auto uriId = env->GetFieldID(apiInfoClass, "uri", "Ljava/lang/String;");
+    auto versionId = env->GetFieldID(apiInfoClass, "version", "I");
+
+    auto uriStr = (jstring) env->GetObjectField(apiInfoObj, uriId);
+    auto versionInt = env->GetIntField(apiInfoObj, versionId);
+
+    model::APIInfo apiInfo(env->GetStringUTFChars(uriStr, nullptr), versionInt);
+    auto path = env->GetStringUTFChars(pathStr, nullptr);
+
+    saveAPIInfo(apiInfo, path);
+}
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_RepeatRepository_updateRepeatMode(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = jstringToString(env, pathStr);
+    updateRepeatMode(dataPath);
+}
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_ShuffleRepository_updateShuffle(
+        JNIEnv *env,
+        jobject thisObj,
+        jstring pathStr
+) {
+    const auto dataPath = jstringToString(env, pathStr);
+    updateShuffleMode(dataPath);
+}
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_TokenRepository_saveTokenRecord(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject tokenObj,
+        jstring pathStr
+) {
+    auto tokenClass = env->GetObjectClass(tokenObj);
+    auto accessTokenId = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
+
+    auto accessTokenVal = (jstring) env->GetObjectField(tokenObj, accessTokenId);
+
+    model::Token token(env->GetStringUTFChars(accessTokenVal, nullptr));
+    auto path = env->GetStringUTFChars(pathStr, nullptr);
+
+    saveToken(token, path);
+}
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_TrackRepositories_downloadSong(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject tokenObj,
+        jobject songObj,
+        jstring pathStr
+) {
+// TODO: left off here
+    auto tokenClass = env->GetObjectClass(tokenObj);
+    auto accessTokenId = env->GetFieldID(tokenClass, "accessToken", "Ljava/lang/String;");
+    auto accessTokenVal = (jstring) env->GetObjectField(tokenObj, accessTokenId);
+    model::Token token(env->GetStringUTFChars(accessTokenVal, nullptr));
+
+    auto song = ObjToSong<jobject, JNIEnv>(env, songObj);
+    auto path = env->GetStringUTFChars(pathStr, nullptr);
+
+
+}
+
+extern "C"
+JNIEXPORT void
+JNICALL
+Java_com_example_mear_repositories_UserRepository_saveUserCredentials(
+        JNIEnv *env,
+        jobject thisObj,
+        jobject user,
+        jstring appDirectory
+) {
+    jclass userClass = env->GetObjectClass(user);
+    auto usernameId = env->GetFieldID(userClass, "username", "Ljava/lang/String;");
+    auto passwordId = env->GetFieldID(userClass, "password", "Ljava/lang/String;");
+
+    auto usernameStr = (jstring) env->GetObjectField(user, usernameId);
+    auto passwordStr = (jstring) env->GetObjectField(user, passwordId);
+
+    const std::string username = env->GetStringUTFChars(usernameStr, nullptr);
+    const std::string password = env->GetStringUTFChars(passwordStr, nullptr);
+    const std::string appDirectoryStr = env->GetStringUTFChars(appDirectory, nullptr);
+
+    model::User usr(username, password);
+
+    saveCredentials(usr, appDirectoryStr);
+}
+
+
+#endif //MEAR_DEMO_H
diff --git a/app/src/main/cpp/repository/SongRepository.h b/app/src/main/cpp/repository/SongRepository.h
index 52ada8a..02be7e5 100644
--- a/app/src/main/cpp/repository/SongRepository.h
+++ b/app/src/main/cpp/repository/SongRepository.h
@@ -61,6 +61,9 @@ namespace repository {
                             songJson["album_artist"].get<std::string>(),
                             songJson["genre"].get<std::string>(), songJson["duration"].get<int>(),
                             songJson["year"].get<int>(), songJson["coverart_id"].get<int>());
+                    song.filename = "";
+                    song.path = "";
+                    song.downloaded = false;
 
                     songs.push_back(song);
                 }
@@ -109,6 +112,9 @@ namespace repository {
                         s["album_artist"].get<std::string>(), s["genre"].get<std::string>(),
                         s["duration"].get<int>(), s["year"].get<int>(),
                         s["coverart_id"].get<int>());
+                song.filename = "";
+                song.path = "";
+                song.downloaded = false;
 
                 return song;
             }
diff --git a/build.gradle b/build.gradle
index f9a0084..298203e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files