Moved a TODO