lots of work on the android app
lots of stuff