diff --git a/source/tlang/compiler/codegen/instruction.d b/source/tlang/compiler/codegen/instruction.d
index c2e248f0..23d55a94 100644
--- a/source/tlang/compiler/codegen/instruction.d
+++ b/source/tlang/compiler/codegen/instruction.d
@@ -11,7 +11,7 @@ import compiler.symbols.typing.core : Type;
 public class Instruction
 {
     /* Context for the Instruction (used in emitter for name resolution) */
-    public Context context;
+    public Context context; //TODO: Make this private and add a setCOntext
 
     protected string addInfo;
 
@@ -34,6 +34,11 @@ public class Instruction
     {
         return context;
     }
+
+    public final void setContext(Context context)
+    {
+        this.context = context;
+    }
 }
 
 public class FetchInst :  Instruction