More work on join-stuff