Conference registration 2

Probably worth pulling into master and cleaning up there now, since I'll only be working on it sporadically.