I should have looked harder within the Marathon source for already implemented functionality. ```TimeStamp``` can definitely be used. I'll make the changes and then rebase the PR.