first commit, re-designed interface, android/ios tested working