I think we still need the join unless more work is done here...