Added comments
Added teleport code and tests.