Issue #84: more prep work

- push some more methods around so that the hybrid registration
  can do it's thing