Commit Tues- iOS WORKING / droid not