Last update before submission.

It's slow and awful, but technically complete.