WIP androidification
changes
changes again
Merging androidifcation branch wtih master