Added TODOs and a warning