Content is in place.

Time to merge into master, I think. I won't weird anyone out.