Work in progress

Killing some of the old-style sample code for modern C++