Remove TODO's

Converted TODO's to issue's on GITHUB