Publish date logic almost done