Rewrote Clock to use a CyclicBarrier for incrementing the minute