Stashed some files for later
Stashed some C++ old c++ files
Tried to merge files
Committed some files
Still committing files