Fixed Values, removed main.cpp, and fixed includes.