Presentation TODOs added