Lots of work on Android and iOS Versions