Fixed up some code and removed Teleport for now