Review2.6.2

Had to move the registration out of the class and into the namespace for scoping purposes.