start of handling primary institution better
continued signup work