Some work on todo.py