Next occurrence calculation implemented, now using YAML to persist