Pre-Cleanup Commit

Committing a perfectly good working version, going to recommit a
cleaned up version of the repository