Adding proper TODO and comments