Cleaning up. Implementing states.
Merge remote-tracking branch 'origin/master'
Cleaning up. Implementing states.