merge organization spec
whoops corrects merge that went wrong way