Feature/5 pass in timestamp

Can replace PR #8