Working on adding functionality to main.cpp