diff --git a/source/_topics/templating.markdown b/source/_topics/templating.markdown
index a212e11030f..5bc4c9ea59b 100644
--- a/source/_topics/templating.markdown
+++ b/source/_topics/templating.markdown
@@ -9,11 +9,14 @@ sharing: true
 footer: true
 ---
 
-<p class='note'>
-This is an advanced feature of Home Assistant. You'll need a basic understanding of the [Home Assistant architecture], especially states.
-</p>
+This is an advanced feature of Home Assistant. You'll need a basic understanding of the following things:
+
+  - [Home Assistant architecture], especially states.
+  - [State object]
+
 
 [Home Assistant architecture]: /developers/architecture/
+[State object]: /topics/state_object/
 
 Templating is a powerful feature in Home Assistant that allows the user control over information that is going into and out of the system. It is used for:
 
diff --git a/source/_topics/z-wave.markdown b/source/_topics/z-wave.markdown
new file mode 100644
index 00000000000..4a6471874bd
--- /dev/null
+++ b/source/_topics/z-wave.markdown
@@ -0,0 +1,27 @@
+---
+layout: page
+title: "Z-Wave"
+description: "Extended instructions how to setup Z-Wave."
+date: 2016-03-24 08:49 -0700
+sidebar: false
+comments: false
+sharing: true
+footer: true
+---
+
+![Under Construction](https://i.imgur.com/WkBB4BV.gif)
+
+Z-Wave is a popular home automation protocol that is not always straightforward to setup. This page will try to help you make sense of it all.
+
+## {% linkable_title Supported Z-Wave Sticks %}
+
+#### Aeotec Z-Stick Series 2
+
+Works fine on Linux.
+
+
+## {% linkable_title Stick Alternatives %}
+
+The alternative to a stick is a hub that supports Z-Wave. Home Assistant supports the following hubs with Z-Wave support:
+
+ - [Vera](/components/vera/)