Phpdoc edits
Add Group class
Update TODO