Tweaked a whole bunch of things to make it work.