Biiiig commit. Fixes shit

Restructure, rework, and fix.
Much less poop than prior versions, and noticeably less statics.