screw git small commits, here's another giant code dump for v2, now with android and the start of iOS