Registration this and thats.  Part of #37 and part of #53.