re-arrange conditional to work with Dates obj
convert properties to Date