Android work

Also other things, need to rebase this later