Move TODO to issue tracker