Moved the todo up a few lines