Final versionless commit

Commited final couple of cpp files.