combine things, make form optional?