Tons of factoring, and refactoring. Good stable point to check things
in.