Small cleanup, and add basic outline from our conversation.