Continued refactoring, not sure where this is going.
I think I see how I am going.
Catch up with master.
This is not going to be easy.
Merge pull request #10 from eggrobin/split-preamble

Split preamble.