I'm not sure the organisation stuff is mandatory.  We should probably have a conditional around this block.