Made a whole bunch of changes in an effort to begin cleaning this out. I imagine this is going to wreck a lot of other things...