New registration

see if you find any issues.
Don't forget to cleanup unused code to prevent confusing yourself later.