Rewrite, without the silly items from the past

There was a lot of code in this bundle that didn't need to be there.

Massively cleaned up and hopefully more readable.

Still potential for more cleanup.