finsihed refactoring form groups