Some more work done.
Starting to rework a lot of the stuff.