Added lots of comments/TODOs