Merging in working method written during live demo with @stephenlloyd