Update Group.java

rewrite comments as TODO tags