timestamp added, now to make tests pass
two tests still fail, will come back to