SQUASH: Fixes for previous commit
WIP: Functions for parsing timestamp