Lots of organizing for the ability builder