Add things from John's Plunker