Updates to todos.  Trying to get a fresh, clean build.