Jeremy's refactoring/PhpDoc/TODO's :)