This might be a bit neater if it just treated the single date as the start and end dates here?