Actually including all registration stuff
Resolved merge conflicts