Moved TODO to #10