Brandon updates

First round of updates. 

I'll begin prepping for the new archetype generator to run on this.