Added Lukas TODOs