saving state before changing registration operation
got it performing ok, commiting for posterity
reasonably stable and demo ready