Added (not finished) api + groups