Create add/delete group calls and moved some stuff around