whoops

Conditionals weren't being handled properly
Rip out

Rebuilding the outward-facing parts of the project from the ground up,
with a different paradigm.
Working again

Haven't been committing until I had it working with the new structure.
Woo!