Replay statesaving stuff
Merge branch 'master' of https://github.com/jorgeer/dontpanic