Move join code into pyp10.py