Rework the “register” command to be complete