Added TODOs based on feedback