Added check so can't save a date/time that has already passed, Code needs cleaning up