Couple changes, and once again attempting to get both packs to build