:pencil: Added TODOs