Finished handling groups, updated ace