Done! Only thing 2 do is to generate phpDoc!