Initial work to make this work in Android