Added some comments with TODO