Added a large amount of GUI code, without yet sending events to the Controller or updating from the Model
Fixed merge conflict.