Removed unneccessary stuff and worked on main.cpp