Added all the Android client-side bits