Minor refactors
Updated GI to include APK.
Got a cursor working.