Adding the DataState class to set up state data. Minor changes in the
context file to be looked at tomorrow.