Broken

I broke a lot of stuff, I need to plan this better.  - Committing for
revert.