Staging

I would just merge this crap, but since it's such a radical change I figured someone should look it over first.