Finishing off the sstates
Merge branch 'master' of github.com:malrase/thefortyeight