Bringing temp changes closer to master plan

This will all be removed soon as I switch over to modules. :(