Finalises a working version of the new circulator
Changes the order of execution to try and make sure the keybindings work
Reorganises the timeout logic to avoid advancing immediately after the user has made a request
Sorts out the commenting of the bits and pieces