Enhanced JIP teleport

Higher complexity JIP teleport - adds extra functionality but probably includes some sort of bug.