initial rewiring to get the demo working