Work in progress for the C++ assignment