Working on the registration feature