Some cleanup
Building out registration wrapper
Time to go firm up more definitions in the server