Rejig status codes
Add groups