Updating code to be more modular, to work towards fully displaying the model, and towards more complete editing of the model.