Lots of orginizing for the ability builder