Moved TODO to github issues