Move things around so I can start sharing code with android