Progress on output system
Merge branch 'testing' of https://github.com/tanaes/codiversification into testing

Combine Jon's output with Nate's
Output handlind might be working?