Added user feedback and 2 TODOs!