Large number of functionality additions

To many to remember.  Code calls still need cleaned up.
Registration folder cleanup.
Cleanup

Cleanup