Add group mostly done