Rewrite of the Time Parsing code
Simplified the aggregate