Begin refactor to joda-time