Added some comments/TODOs