More progress on join-existing functionality