Reworked tock, added clean-shots sig and temp

The former contents of tock were moved to a new method move-shots, and
the tests were changed accordingly. Tock was rewritten to run
clean-shots and move-shots on the world.