Changes from meeting made to android app but not fully tested