Elaborated on TODOs