This makes it easier to grok. We are also looking
to rewrite most of this, and doing this in smaller
chunks will make this easier.