More work on cycle.py