Got project into state where it will run again
Back to state that was broken but now works for some reason
Merge branch 'master' into workingState