Checkpoint for moving to Android Studio

Contains beginnings of persistence work.