Feature/iteration 6 dev timestamp

Fixes timestamp issue. 

pcbiggs