Transition away from command-based structure

[james-ward]

Much more Pythonic to do something like yielding at the end of each loop of the functions.