Calendar's working again, though I seem to have introduced some time travel bug that makes new branches start too late