More work on datetime parsing/formatting