First update, ios works, android still in progress