I'm not sure if the following blocks should be indented.  We probably need to consider this flow and the implications of doing so.