Fixed the Golf Demo

It now runs and you get to do a questionnaire at the end. This seems a
good one to get going to test our working bits...