Working on actual state components
Merge branch 'master' of https://github.com/xcabbage/trololus