WIP Adding time zone parsing