Added ability to parse TimeUnits
Forgot comments