Date logic added.  Still needs work