Second commit

still need to finish checking the groups