Did some progress on Android app