Complete re-code, changed storage to YAML instead.
Push these