Moved some things off of the todo list for 3.1