Issue #15: ensure demo is working
Issue #15: demo refactor