diff --git a/Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java b/Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java
index 3dd4d74..f3b2f3a 100644
--- a/Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java
+++ b/Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java
@@ -101,6 +101,7 @@ import triangle.abstractSyntaxTrees.vnames.SimpleVname;
 import triangle.abstractSyntaxTrees.vnames.SubscriptVname;
 import triangle.abstractSyntaxTrees.vnames.Vname;
 import triangle.codeGenerator.entities.AddressableEntity;
+import triangle.codeGenerator.entities.BarPrimitiveRoutine;
 import triangle.codeGenerator.entities.EqualityRoutine;
 import triangle.codeGenerator.entities.FetchableEntity;
 import triangle.codeGenerator.entities.Field;
@@ -184,6 +185,11 @@ public final class Encoder implements ActualParameterVisitor<Frame, Integer>,
 	
 	@Override
 	public Void visitRepeatCommand(RepeatCommand ast, Frame frame) {
+		var loopAddr = emitter.getNextInstrAddr();
+		ast.C.visit(this, frame);
+		ast.E.visit(this, frame);
+		emitter.emit(OpCode.JUMPIF, Machine.falseRep, Register.CB, loopAddr);
+		
 		return null;
 	}
 
@@ -740,6 +746,7 @@ public final class Encoder implements ActualParameterVisitor<Frame, Integer>,
 		elaborateStdPrimRoutine(StdEnvironment.puteolDecl, Primitive.PUTEOL);
 		elaborateStdEqRoutine(StdEnvironment.equalDecl, Primitive.EQ);
 		elaborateStdEqRoutine(StdEnvironment.unequalDecl, Primitive.NE);
+		StdEnvironment.barDecl.entity = new BarPrimitiveRoutine(); //bardemo.tri now works
 	}
 
 	boolean tableDetailsReqd;
diff --git a/Triangle.Compiler/src/main/java/triangle/codeGenerator/entities/BarPrimitiveRoutine.java b/Triangle.Compiler/src/main/java/triangle/codeGenerator/entities/BarPrimitiveRoutine.java
new file mode 100644
index 0000000..101fccd
--- /dev/null
+++ b/Triangle.Compiler/src/main/java/triangle/codeGenerator/entities/BarPrimitiveRoutine.java
@@ -0,0 +1,27 @@
+package triangle.codeGenerator.entities;
+
+import triangle.abstractMachine.Machine;
+import triangle.abstractMachine.OpCode;
+import triangle.abstractMachine.Primitive;
+import triangle.abstractMachine.Register;
+import triangle.codeGenerator.Emitter;
+import triangle.codeGenerator.Frame;
+
+public class BarPrimitiveRoutine extends RuntimeEntity implements RoutineEntity {
+
+	public BarPrimitiveRoutine() {
+		super(Machine.closureSize);
+	}
+
+	public void encodeCall(Emitter emitter, Frame frame) {
+		//machine code to load 100 onto the stack
+		emitter.emit(OpCode.LOADL, 0, 100);
+		emitter.emit(OpCode.CALL, Register.PB, Primitive.MULT);
+	}
+
+	public void encodeFetch(Emitter emitter, Frame frame) {
+		emitter.emit(OpCode.LOADA, 0, Register.SB, 0);
+		emitter.emit(OpCode.LOADA, Register.PB, Primitive.MULT);
+	}
+
+}
diff --git a/Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java b/Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java
index 188a632..e244217 100644
--- a/Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java
+++ b/Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java
@@ -188,6 +188,11 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	
 	@Override
 	public Void visitRepeatCommand(RepeatCommand ast, Void arg) {
+		var eType = ast.E.visit(this);
+
+		checkAndReportError(eType.equals(StdEnvironment.booleanType), "Boolean expression expected here", ast.E);
+		ast.C.visit(this);
+
 		return null;
 	}
 
diff --git a/Triangle.Compiler/src/main/java/triangle/optimiser/ConstantFolder.java b/Triangle.Compiler/src/main/java/triangle/optimiser/ConstantFolder.java
index fec6b56..903f87a 100644
--- a/Triangle.Compiler/src/main/java/triangle/optimiser/ConstantFolder.java
+++ b/Triangle.Compiler/src/main/java/triangle/optimiser/ConstantFolder.java
@@ -497,14 +497,13 @@ public class ConstantFolder implements ActualParameterVisitor<Void, AbstractSynt
 		return null;
 	}
 	
-	/*
 	@Override
 	public AbstractSyntaxTree visitRepeatCommand(RepeatCommand ast, Void arg) {
 		return null;
 	}
-	*/
 
-	// TODO uncomment if you've implemented the repeat command
+	/*
+	 * Now not needed!
 	@Override
 	public AbstractSyntaxTree visitRepeatCommand(RepeatCommand ast, Void arg) {
 		ast.C.visit(this);
@@ -514,6 +513,7 @@ public class ConstantFolder implements ActualParameterVisitor<Void, AbstractSynt
 		}
 		return null;
 	}
+	*/
 
 	@Override
 	public AbstractSyntaxTree visitMultipleArrayAggregate(MultipleArrayAggregate ast, Void arg) {
diff --git a/Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java b/Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java
index 9c7a4bf..035e683 100644
--- a/Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java
+++ b/Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java
@@ -602,7 +602,7 @@ public class Parser {
 		start(declarationPos);
 
 		switch (currentToken.kind) {
-
+		
 		case Token.CONST: {
 			acceptIt();
 			Identifier iAST = parseIdentifier();
diff --git a/build/libs/Triangle-Tools.jar b/build/libs/Triangle-Tools.jar
index 1181f38..b93029b 100644
Binary files a/build/libs/Triangle-Tools.jar and b/build/libs/Triangle-Tools.jar differ
diff --git a/programs/adddeep-folded.tam b/programs/adddeep-folded.tam
new file mode 100644
index 0000000..4c9cdbf
Binary files /dev/null and b/programs/adddeep-folded.tam differ
diff --git a/programs/adddeep-notfolded.tam b/programs/adddeep-notfolded.tam
new file mode 100644
index 0000000..2daa905
Binary files /dev/null and b/programs/adddeep-notfolded.tam differ
diff --git a/programs/bardemo.tam b/programs/bardemo.tam
new file mode 100644
index 0000000..ee1e54e
Binary files /dev/null and b/programs/bardemo.tam differ
diff --git a/programs/bardemo.tri b/programs/bardemo.tri
index f730f74..a5373fc 100644
--- a/programs/bardemo.tri
+++ b/programs/bardemo.tri
@@ -5,7 +5,7 @@ let
 
 in
     begin
-        a := 1;
+        a := 4;
         b := 2;
         
         putint(a);
diff --git a/programs/plusplusidea.tam b/programs/plusplusidea.tam
new file mode 100644
index 0000000..ba866c1
Binary files /dev/null and b/programs/plusplusidea.tam differ
diff --git a/programs/plusplusidea.tri b/programs/plusplusidea.tri
new file mode 100644
index 0000000..bf062f4
--- /dev/null
+++ b/programs/plusplusidea.tri
@@ -0,0 +1,8 @@
+let
+    var a: Integer
+in
+begin
+    a := 0;
+    a := a + 1;
+    putint(a);
+end
diff --git a/programs/repeatuntil.tam b/programs/repeatuntil.tam
index 7091eac..db8cb7a 100644
Binary files a/programs/repeatuntil.tam and b/programs/repeatuntil.tam differ