Week 3 Final Commit

3 of 4 features working on iOS as well as all of week 2 requirements.

2 working on Android as well.