v0.31 - basic persistence ready, no unit tests