added time component
Merge branch 'Hopper'