Began the Refactor :D

This is how you refactor :P
I should Really murder Abrar :P
Merge pull request #5 from CaptainShadows/master

This IS the refractor you're looking for...