Gpii 947

http://issues.gpii.net/browse/GPII-947
You might want to start moving some of this state into the model and use modelListeners to update the presentation.