More stuff in the todo program