Moved the group parsing code to the group class. Still have to clean up the old code in the collision model