Moved TODO into Github issues