WIP -- added demo code