Make groups

merging groups things done on sunday to master. Master has no commit ahead.