State messages

Merging in the state-messages branch.  Implemented state messages and correction.  Pending final tests for merge into develop and then master.