More procedure work
Updated todo.org