Make organisations dynamic

The hard-coded "1" was obviously going to fail in a full environment.