Moved TODO item to #10, see #8