Big Partial Push

Just get everything back up to date.
Nothing is perfect, but I want to see how it performs.