added groups and HABTM relationship