Implemented DAOGroups
fixed conflicts