Added few TODOs

Signed-off-by: TheCodeArtist <cvs268@gmail.com>