revived the signup code
completed merge