moved a comment and made it a possible TODO