Ready to update group and cohort models

Probably a few things I missed, but please check it out and let me know.