Big dump of initial cpp file

I should cut up this file
Test-api to output
Removed semi-colons