Forgot to mention actually, please make sure EVERY property and method is docblocked, and use this:

    public static function

Could you do another merge?