- Monsterous commit, should have committed a long time ago
- Moved a lot of billing stuff to the baseactivity and confirm dialog