Starting rework. Build KO
Now groups adding, delete and modification works