[FEATURE] Groups nearly working