Did a litte change and a lot of refactoring. I'm really commiting to try
to beat Vazkii's commit streak and about to swich to my laptop.

Signed-off-by: Anthony Anderson <lordillyohs@gmail.com>