Mid Tutorial 10 - HUGE changes

The tutorial pretty much changed every file… So its a mess.  It builds
fine but struggles to run.