Moved TODO to #11