Nothing like a pull request that adds 441 lines and removes 5,539

Nothing like a pull request that adds 441 lines and removes 5,539