Add groups to server

Okay I'll fix it both in this PR.