diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java b/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
index 120b29a..1172a88 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/DataStorageDecision.java
@@ -30,13 +30,7 @@
 				flag = true;
 			}
 		}
-		boolean flag2 = false;
-		for (Edge e : resource.getOutEdges()) {
-			if (((PushPullAttribute) e.getAttribute()).getOptions().get(0) != PushPullValue.PUSH) {
-				flag2 = true;
-			}
-		}
-		if (resource.getInEdges().size() == 0 && flag2)
+		if (resource.getInEdges().size() == 0)
 			flag = true;
 		((StoreAttribute) resource.getAttribute()).setStored(flag);
 		if (resource.getIdentifierTemplate().getResourceStateType() == null) {
diff --git a/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java b/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
index a2e7dc8..f1689ff 100644
--- a/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
+++ b/AlgebraicDataflowArchitectureModel/src/algorithms/UpdateConflictCheck.java
@@ -3,7 +3,6 @@
 import java.util.*;
 
 import models.*;
-import models.dataConstraintModel.*;
 import models.dataFlowModel.*;
 
 public class UpdateConflictCheck {
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/History.java b/AlgebraicDataflowArchitectureModel/src/experiment/History.java
deleted file mode 100644
index 57a6f54..0000000
--- a/AlgebraicDataflowArchitectureModel/src/experiment/History.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package experiment;
-
-public class History {
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/Main.java b/AlgebraicDataflowArchitectureModel/src/experiment/Main.java
deleted file mode 100644
index 7ab98cd..0000000
--- a/AlgebraicDataflowArchitectureModel/src/experiment/Main.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package experiment;
-
-public class Main {
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/Payment.java b/AlgebraicDataflowArchitectureModel/src/experiment/Payment.java
deleted file mode 100644
index 6657a9a..0000000
--- a/AlgebraicDataflowArchitectureModel/src/experiment/Payment.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package experiment;
-
-public class Payment {
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/Points.java b/AlgebraicDataflowArchitectureModel/src/experiment/Points.java
deleted file mode 100644
index 7a5c1a5..0000000
--- a/AlgebraicDataflowArchitectureModel/src/experiment/Points.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package experiment;
-
-public class Points {
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/PullExpriment.java b/AlgebraicDataflowArchitectureModel/src/experiment/PullExpriment.java
new file mode 100644
index 0000000..2ea3d4f
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/PullExpriment.java
@@ -0,0 +1,7 @@
+package experiment;
+
+import experiment.pull.Main;
+
+public class PullExpriment {
+	Main main = new Main();
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/PushExperiment.java b/AlgebraicDataflowArchitectureModel/src/experiment/PushExperiment.java
new file mode 100644
index 0000000..200164c
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/PushExperiment.java
@@ -0,0 +1,7 @@
+package experiment;
+
+import experiment.push.Main;
+
+public class PushExperiment {
+	Main main = new Main();
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/Total.java b/AlgebraicDataflowArchitectureModel/src/experiment/Total.java
deleted file mode 100644
index 1a87bfe..0000000
--- a/AlgebraicDataflowArchitectureModel/src/experiment/Total.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package experiment;
-
-public class Total {
-
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/pull/History.java b/AlgebraicDataflowArchitectureModel/src/experiment/pull/History.java
new file mode 100644
index 0000000..81dce56
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/pull/History.java
@@ -0,0 +1,13 @@
+package experiment.pull;
+
+import java.util.ArrayList;
+
+public class History {
+	private ArrayList<Integer> history = new ArrayList<Integer>();
+	public void updatePayment(int payment) {
+		history.add(payment);
+	}
+	public ArrayList<Integer> getHistory() {
+		return history;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/pull/Main.java b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Main.java
new file mode 100644
index 0000000..5aa2c3f
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Main.java
@@ -0,0 +1,25 @@
+package experiment.pull;
+
+import java.util.ArrayList;
+
+public class Main {
+	private History history = new History();
+	private Total total = new Total(history);
+	private Payment payment = new Payment(history);
+	private Points points = new Points(payment);
+	public void purchase(int payment) {
+		this.payment.purchase(payment);
+	}
+	public int getTotal() {
+		return total.getTotal();
+	}
+	public int getPayment() {
+		return payment.getPayment();
+	}
+	public ArrayList<Integer> getHistory() {
+		return history.getHistory();
+	}
+	public int getPoints() {
+		return points.getPoints();
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/pull/Payment.java b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Payment.java
new file mode 100644
index 0000000..0307cef
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Payment.java
@@ -0,0 +1,16 @@
+package experiment.pull;
+
+public class Payment {
+	private History history;
+	private int payment;
+	public Payment(History history) {
+		this.history = history;
+	}
+	public void purchase(int payment) {
+		this.payment = payment;
+		history.updatePayment(payment);
+	}
+	public int getPayment() {
+		return payment;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/pull/Points.java b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Points.java
new file mode 100644
index 0000000..2eaaf56
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Points.java
@@ -0,0 +1,11 @@
+package experiment.pull;
+
+public class Points {
+	private Payment payment;
+	public Points(Payment payment) {
+		this.payment = payment;
+	}
+	public int getPoints() {
+		return (int)Math.floor((payment.getPayment()*0.05));
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/pull/Total.java b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Total.java
new file mode 100644
index 0000000..384af94
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/pull/Total.java
@@ -0,0 +1,11 @@
+package experiment.pull;
+
+public class Total {
+	private History history;
+	public Total(History history) {
+		this.history = history;
+	}
+	public int getTotal() {
+		return history.getHistory().stream().mapToInt(x->x).sum();
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/push/History.java b/AlgebraicDataflowArchitectureModel/src/experiment/push/History.java
new file mode 100644
index 0000000..58d4fa3
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/push/History.java
@@ -0,0 +1,18 @@
+package experiment.push;
+
+import java.util.ArrayList;
+
+public class History {
+	private Total total;
+	private ArrayList<Integer> history = new ArrayList<Integer>();
+	public void updatePayment(int payment) {
+		history.add(payment);
+		total.updateHistory(history);
+	}
+	public History(Total total) {
+		this.total = total;
+	}
+	public ArrayList<Integer> getHistory() {
+		return history;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/push/Main.java b/AlgebraicDataflowArchitectureModel/src/experiment/push/Main.java
new file mode 100644
index 0000000..9edf4f4
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/push/Main.java
@@ -0,0 +1,25 @@
+package experiment.push;
+
+import java.util.ArrayList;
+
+public class Main {
+	private Total total = new Total();
+	private Points points = new Points();
+	private History history = new History(total);
+	private Payment payment = new Payment(points,history);
+	public void purchase(int payment) {
+		this.payment.purchase(payment);
+	}
+	public int getTotal() {
+		return total.getTotal();
+	}
+	public int getPayment() {
+		return payment.getPayment();
+	}
+	public ArrayList<Integer> getHistory() {
+		return history.getHistory();
+	}
+	public int getPoints() {
+		return points.getPoints();
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/push/Payment.java b/AlgebraicDataflowArchitectureModel/src/experiment/push/Payment.java
new file mode 100644
index 0000000..47e6ca3
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/push/Payment.java
@@ -0,0 +1,19 @@
+package experiment.push;
+
+public class Payment {
+	private Points points;
+	private History history;
+	private int payment;
+	public Payment(Points points, History history) {
+		this.points = points;
+		this.history = history;
+	}
+	public void purchase(int payment) {
+		this.payment = payment;
+		points.updatePayment(payment);
+		history.updatePayment(payment);
+	}
+	public int getPayment() {
+		return payment;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/push/Points.java b/AlgebraicDataflowArchitectureModel/src/experiment/push/Points.java
new file mode 100644
index 0000000..41a59c8
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/push/Points.java
@@ -0,0 +1,11 @@
+package experiment.push;
+
+public class Points {
+	private int points;
+	public void updatePayment(int payment) {
+		points = (int)Math.floor((payment*0.05));
+	}
+	public int getPoints() {
+		return points;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/experiment/push/Total.java b/AlgebraicDataflowArchitectureModel/src/experiment/push/Total.java
new file mode 100644
index 0000000..25b5e24
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/experiment/push/Total.java
@@ -0,0 +1,13 @@
+package experiment.push;
+
+import java.util.ArrayList;
+
+public class Total {
+	private int total;
+	public void updateHistory(ArrayList<Integer> history) {
+		total = history.stream().mapToInt(x->x).sum();
+	}
+	public int getTotal() {
+		return total;
+	}
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
index ef8b671..a0906f5 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/CodeGeneratorTest.java
@@ -7,8 +7,6 @@
 import java.util.ArrayList;
 
 import algorithms.*;
-import code.ast.FieldDeclaration;
-import code.ast.MethodDeclaration;
 import code.ast.TypeDeclaration;
 import models.dataFlowModel.*;
 import parser.*;
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
index 864e816..04ad162 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/ParseTest.java
@@ -1,7 +1,5 @@
 package tests;
 
-import static org.junit.Assert.assertEquals;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -14,11 +12,7 @@
 import models.algebra.ValueUndefined;
 import models.dataConstraintModel.ChannelGenerator;
 import models.dataConstraintModel.ChannelMember;
-import models.dataFlowModel.DataFlowModel;
-import models.dataFlowModel.DataflowChannelGenerator;
-import models.dataFlowModel.ResolvingMultipleDefinitionIsFutureWork;
-import models.dataFlowModel.ResourceDependencyGraph;
-import models.dataFlowModel.ResourceNode;
+import models.dataFlowModel.*;
 import parser.ExpectedChannel;
 import parser.ExpectedChannelName;
 import parser.ExpectedEquals;
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
index 902d01f..870769f 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/UpdateCodeGenerationTest.java
@@ -1,9 +1,5 @@
 package tests;
 
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
 import models.algebra.Constant;
 import models.algebra.Expression;
 import models.algebra.Field;
@@ -15,12 +11,7 @@
 import models.algebra.UnificationFailed;
 import models.algebra.ValueUndefined;
 import models.algebra.Variable;
-import models.dataConstraintModel.ChannelMember;
-import models.dataConstraintModel.ChannelSelector;
-import models.dataConstraintModel.DataConstraintModel;
-import models.dataConstraintModel.GroupSelector;
-import models.dataConstraintModel.IdentifierTemplate;
-import models.dataConstraintModel.StateTransition;
+import models.dataConstraintModel.*;
 import models.dataFlowModel.DataFlowModel;
 import models.dataFlowModel.DataflowChannelGenerator;
 import models.dataFlowModel.DataflowChannelGenerator.IResourceStateAccessor;