Added TODO's in main.cpp