diff --git a/src/jrummikub/model/StoneHeap.java b/src/jrummikub/model/StoneHeap.java
new file mode 100644
index 0000000..bb6470e
--- /dev/null
+++ b/src/jrummikub/model/StoneHeap.java
@@ -0,0 +1,37 @@
+package jrummikub.model;
+
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Random;
+
+public class StoneHeap {
+	List<Stone> heap;
+	Random generator = new Random();
+
+	public StoneHeap() {
+		heap = new ArrayList<Stone>();
+		for (int i = 1; i <= 13; i++) {
+			for (int j = 0; j < 2; j++) {
+				for (StoneColor c : EnumSet.allOf(StoneColor.class)) {
+					heap.add(new Stone(i, c, false));
+				}
+			}
+		}
+		// Joker
+		heap.add(new Stone(0, StoneColor.BLACK, true));
+		heap.add(new Stone(0, StoneColor.ORANGE, true));
+	}
+
+	public Stone drawStone() {
+		return heap.remove(generator.nextInt(heap.size()));
+	}
+	
+	public List<Stone> drawStones(int number) {
+		List<Stone> drawnStones = new ArrayList<Stone>();
+		for (int i=0; i<number; i++){
+			drawnStones.add(drawStone());
+		}
+		return drawnStones;
+	}
+}