add support for join, also a minor upgrade to 11 schema (I think)