First draft - untested with database
Merge branch 'master' of https://github.com/dmrd/registrar