Added a few building permutations and changed how that part of the code is organized.