State class and other stuff
Merge branch 'master' of https://github.com/jaivalis/aa