WIP starting work on issue #5 but currently having date comparison issues (naive)