Groups working
More refacotr
Moved adjustGroup