Registration working, sort of, fixes #9