Moved manual todo's to the todo extension.