Major changes everywhere. State subclassing.
Merge remote-tracking branch 'origin/master'