Some work on the Android platform (yay!)