ENH:  Part 2 of edits to make the registration component work.