diff --git a/gotime/src/exercise-maps.go b/gotime/src/exercise-maps.go
new file mode 100644
index 0000000..9d6f71a
--- /dev/null
+++ b/gotime/src/exercise-maps.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+    "strings"
+    "code.google.com/p/go-tour/wc"
+)
+
+func WordCount(s string) map[string]int {
+    counts := make(map[string]int)
+    words := strings.Fields(s)
+    for _, word := range words {
+        counts[word]++
+    }
+    return counts
+}
+
+func main() {
+    wc.Test(WordCount)
+}