Commit so I can move to Android Studio