adding TODOs. I realy like this demo project