Moving things around a ton.

Also, implementing more of the new pipeline. It's still not working, but
we're getting closer to something that could work soon.