Refactoring, code cleanup, regoranization,  Registration validation
assorted fixes. Moving along
Refactoring, code cleanup, regoranization,  Registration validation
assorted fixes. Moving along