More sanity checks
Consolidated registration into a single step