Final commit for week 3

All things work on both ios and Android