Done with first pass on Demo vignette