Finish Groups pg and refactor project form as a result