Working on making date time more flexible