Made some headway towards fully implementing Android support.