Cleaned up main.py and added a bit more to the teleport class