More, more, more!

I've been doing a massive amount of work on multiple fronts. I will start separating out my UI work from core work, but for now here is another massive bit.