Moving time parsing into a util module
WIP migration tool