Added TODO to demo.cpp