Revert "Revert "Registry (Part 1)""

This reverts commit ef159761799b58ee0559f697b745729b1bd3812d.