Change yet more join code...

One day I'll decide on class names etc! One day...