Moved around a bunch of stuff, prepping for a more general solution.