6690bcb101
This cleans up the merging of removing ~fn() and removing C++ wrappers to a compile-able and progress-ready state