Replicating Raw Time Date code to v3 (related to #31)