Began the Refactor :D

This is how you refactor :P