finished assessment refactor with group