move TODO to Issue #3