Some work on the signup flow