Did some reshufflilng...

'Did some reshuffling for two purposes: 1) to make the whole thing
easier to edit in my text editor, and 2) see highlight the places where
I need to fill out the outline a bit.