Register

This should be ready for master.