Big progress towards android/iOS integration