For discussion

This is intended to be rejected, I will rewrite this history into a few concise clean commits, but I wanted to hear what the project owner's comments on some of these changes he doesn't like.