Adding TODOs to review current implementation