Brandon upgrades

I tried to clean up the archetype, but was running into issues with the mvp entry point.