Added .cpp, cleaned up a few things.