Finished iOS and Android impl