diff --git a/CodeTools.md b/CodeTools.md
new file mode 100644
index 00000000..b2c20920
--- /dev/null
+++ b/CodeTools.md
@@ -0,0 +1,20 @@
+An overview of tools that will help improve your Go code
+
+## Code Formatting
+
+  - [gofmt](https://golang.org/cmd/gofmt/) - Start with the standard Go code formatter
+  - [golint](https://github.com/golang/lint) - Detects style mistakes in Go code
+  - [goimports](https://github.com/bradfitz/goimports) - Format code and fix your import statements
+  - [Formatting Go Code with gofmt](http://golangtutorials.blogspot.com/2011/06/formatting-go-code-with-gofmt.html)
+
+## Refactoring
+  - [Refactoring with go fmt](http://spf13.com/post/go-fmt/)
+  - [gorename - easy refactoring](https://texlution.com/post/gorename/)
+
+## Error Detection
+
+  - [go vet](http://golang.org/cmd/vet/) - Read this first on how to use the `go vet` command.
+
+## Navigation
+
+  - [go oracle - user manual](http://golang.org/s/oracle-user-manual) - A tool for understanding Go code
diff --git a/Home.md b/Home.md
index 36969848..625b7b8b 100644
--- a/Home.md
+++ b/Home.md
@@ -37,6 +37,7 @@ Ready to write some Go code of your own? Here are a few links to help you  get s
       - If you need additional tips on using [$GOPATH, go here](GOPATH).
     - [MultipleGoRoots](MultipleGoRoots) - More advanced information on working with multiple go installations and the `$GOROOT` variable.
   - [Go IDEs and Editors](IDEsAndTextEditorPlugins) - Information on how to use your favorite editor with Go.
+  - [Tools for working with Go code](CodeTools) - Formatting, linting, vetting, refactoring.
   - Finding Go Libraries & Tools
     - Start by searching [godoc.org](http://godoc.org)
     - Then check this list of [Go open source projects](Projects) for additional search tools and curated lists.