initial work on output variables.
Replaced state string literals with constants