Made a first pass at explicity modeling the state of the entire application.