checkpointing work
Merge branch 'other-stuff' of github.com:viafoura/buri into other-stuff
add more WIP stuff from redmine