Architecture Redesign

Nothing works now, but hopefully you'll see the logic behind this setup.