Started to get the demo working.