Non-City Tech signup, first pass.

See #1237.