Changes names, and moved main into the .cpp file. Also added comments