Issue #9, adding a clock