Refactoring Hammad...

It'd take me a month to understand the stuff he in just about three
hours...