Testing to Master

To merge testing into master and remove all old c++ code.