more progress on joins, almost there