Baby steps
Merge branch 'persistence' of https://github.com/tivac/tristis into persistence