Safety commit.
Groups feature added. Final commit before merge.