Issue #72

Changes required by issue #72 - extending the groupEvent model
This TODO isn't necessary anymore isn't it?