Added TODOs and working on