Switch to clockwork

Fix #996 
Will switch.