merge, working on tests and group managment