Working (somewhat unsuccessfully) on the user-hop-registration interaction
Merged changes