[wip] Added some more routines (Wander and Repeat) and changed the code to support them