diff --git a/main.py b/main.py
index ecb7682..a2dcba6 100644
--- a/main.py
+++ b/main.py
@@ -1,27 +1,26 @@
 #!/usr/bin/env python
 
 import yaml
-import save
 
 def validate_encounter(encounter):
-    match encounter:
-        case "items":
-            raise ValueError("'items' is not a valid encounter")
-        case "exit":
-            exit()
-        case _:
-            run_encounter(encounter)
+    run_encounter(encounter)
 
 def run_encounter(encounter):
-    print(encounter['scenario'])
-    print(encounter['choices'])
-    playerChoice = int(input())
-    if playerChoice >= 0 and playerChoice <= 9:
-        validate_encounter(game[encounter['choices'][playerChoice]])
-    else:
-        raise ValueError("Input is invalid\n")
+    if 'scenario' in encounter:
+        print(encounter['scenario'])
+    if 'choices' in encounter:
+        for choice in range(len(encounter['choices'])):
+            print(f"{choice}. {encounter['choices'][choice]}")
+        playerChoice = int(input("> "))
+        if playerChoice >= 0 and playerChoice <= 9:
+            if encounter['choices'][playerChoice] == "Exit game":
+                exit()
+            else:
+                validate_encounter(game[encounter['choices'][playerChoice]])
+    elif "goto" in encounter:
+        validate_encounter(game[encounter['goto']])
 
 if __name__ == '__main__':
     with open("sample.yaml", "r") as file:
         game = yaml.safe_load(file)
-    validate_encounter(game['Title Screen'])
+    validate_encounter(game['entrypoint'])
diff --git a/sample.yaml b/sample.yaml
index 7f1e855..0a95c5b 100644
--- a/sample.yaml
+++ b/sample.yaml
@@ -1,8 +1,12 @@
+entrypoint:
+  scenario: "This is the entrypoint. Normally you shouldn't have scenario or choices."
+  goto: "titlescreen"
+
 titlescreen:
   scenario: "Welcome to the sample game! There's not much here to do, but this will be used to demonstrate examples.\nBefore you is a table with a salad."
   choices: ["eat salad"]
 
 eat salad:
-  scenario: "You ate the salad."
-  choices: ["exit"]
+  scenario: "You ate the salad. The salad was poisoned. You died."
+  choices: ["Exit game"]