Start over with a calendar finder

Still WIP