Added some comments and TODOs