Added TODOs for the future