Start on making date formats consistent