More updates.
First bits of group support. Not yet working.