rpearce: initial stabbing, got delayed on other work. Still not working
but a baby step forward