More refactor progress to put everything into groups attr