Rename things around a bit.
Keep revising this to be a working SavingActivity project.
Sync with our project