partial implementation of teleport
Merge branch 'ronwork'
Merge branch 'chris-work'