More Overhaul. (Refactor Massacre Part 2)