Converting TODO to issue to make it easier to track from readme
Converting TODO to issue to make it easier to track from readme