Properly handle timestamps. Probably.