Almost there now, have date validation working