time field almost works
merge resolved