Sounds good. I'll update the templates to check for the dates as well and adjust the front end accordingly. I'll ping @talbs on those changes as well.