initial support for state
resolved merge conflicts
cleanup
resolved checkin issue
Merge branch 'master' of https://github.com/tunacasserole/omni