split out some of the demo cruft