Added TODOs and comments