Add some more date logic.