Made the organisation thing actually work properly