Saving progress
Fixed new Android Studio warnings. Remove code for quick returns.