More work on code block.