diff --git a/lib/koans/03_maps.ex b/lib/koans/03_maps.ex
new file mode 100644
index 0000000..990e700
--- /dev/null
+++ b/lib/koans/03_maps.ex
@@ -0,0 +1,65 @@
+defmodule Maps do
+  use Koans
+
+  koan "Maps represent structured data, like a person" do
+    assert %{ :name => "Jon",
+              :last_name => "Snow",
+              :age => 27 } == %{ :name => "Jon",
+                                 :last_name => "Snow",
+                                 :age => 27 }
+  end
+
+  koan "You can get all the keys from the map" do
+    assert Map.keys(%{ :name => "Jon", :last_name => "Snow", :age => 27 }) == [:age, :last_name, :name]
+  end
+
+  koan "Or you can also get all the values from it" do
+    assert Map.values(%{ :name => "Jon", :last_name => "Snow", :age => 27 }) == [27, "Snow", "Jon"]
+  end
+
+  koan "Fetching a value returns a touple with ok when it exists..." do
+    assert Map.fetch(%{ :name => "Jon", :last_name => "Snow", :age => 27 }, :age) == {:ok, 27}
+  end
+
+  koan "...or the atom :error when it doesnt." do
+    assert Map.fetch(%{ :name => "Jon", :last_name => "Snow", :age => 27 }, :family) == :error
+  end
+
+  koan "Extending a map is a simple as put'ing in a new pair" do
+    assert Map.put(%{ :name => "Jon", :last_name => "Snow"}, :age, 27) == %{ :name => "Jon", :last_name => "Snow", :age => 27 }
+  end
+
+  koan "Put can also overwrite existing values" do
+    assert Map.put(%{ :name => "Jon", :last_name => "Snow", :age => 15}, :age, 27) == %{ :name => "Jon", :last_name => "Snow", :age => 27 }
+  end
+
+  koan "Or you can use some syntactic sugar for exiting elements." do
+    initial = %{ :name => "Jon", :last_name => "Snow", :age => 15}
+    assert %{ initial | :age => 27 } == %{ :name => "Jon", :last_name => "Snow", :age => 27 }
+  end
+
+  koan "Can remove pairs by key" do
+    assert Map.delete(%{ :name => "Jon", :last_name => "Snow", :age => 15}, :age) == %{ :name => "Jon", :last_name => "Snow"}
+  end
+
+  koan "If you have a list of pairs, you can turn them into a map" do
+    assert Map.new( [{:name, "Jon"}, {:last_name, "Snow"}, {:age, 27}] ) == %{ :name => "Jon", :last_name => "Snow", :age => 27 }
+  end
+
+  koan "Going back to a list of pairs is just as easy." do
+    assert Map.to_list(%{ :name => "Jon", :last_name => "Snow", :age => 27 }) == [age: 27, last_name: "Snow", name: "Jon" ]
+  end
+
+  koan "Can merge maps" do
+    assert Map.merge(%{:name => "Jon"}, %{ :last_name => "Snow"}) == %{:name => "Jon", :last_name => "Snow"}
+  end
+
+  koan "When merging, the last map wins" do
+    assert Map.merge(%{:name => "Robert", :last_name => "Snow"}, %{ :last_name => "Baratheon"}) == %{:name => "Robert", :last_name => "Baratheon"}
+  end
+
+  koan "You can also select sub-maps out of a larger map" do
+    initial = %{ :name => "Jon", :last_name => "Snow", :age => 15}
+    assert Map.take(initial, [:name, :last_name]) == %{ :name => "Jon", :last_name => "Snow"}
+  end
+end