More or less complete first draft of demo