Add groups to server

Let's do this reshuffling in a separate PR though.