Changes to compile and run, works on first run only but at least does compile and run now