Switching to iOS for time being
Commiting these two so they don't get overwritten
Merging old with new. Android to iOS