Progress on main.cpp