Done for now

Going to work on the Android version