Super Duper Refactor Massacre Part 1.5
* Implementation.