Huge amount of changes - many refactoring changes to begin to integrate
with Android Dalvik