Android app sort of working now