Some work on the sign up routine