More work tying together conceptual code.