Fleshed out more of the code structure.