Switch to clockwork

Fix #996