Starting work on iOS final version