Rearrange code, add rfc 3339 / ISO 8601 examples