diff --git a/_data/interests.yml b/_data/interests.yml
new file mode 100644
index 0000000..d31aa1c
--- /dev/null
+++ b/_data/interests.yml
@@ -0,0 +1,6 @@
+- interest:
+  item: Climbing
+- interest:
+  item: Snowboarding
+- interest:
+  item: Cooking
diff --git a/_data/languages.yml b/_data/languages.yml
new file mode 100644
index 0000000..52b5b52
--- /dev/null
+++ b/_data/languages.yml
@@ -0,0 +1,9 @@
+- language:
+  idiom: English
+  level: Native
+- language:
+  idiom: French
+  level: Professional
+- language:
+  idiom: Spanish
+  level: Professional
diff --git a/_includes/interests.html b/_includes/interests.html
index f529950..9e8d6cc 100644
--- a/_includes/interests.html
+++ b/_includes/interests.html
@@ -1,8 +1,13 @@
+{% if site.data.interests %}
 <div class="interests-container container-block">
-<h2 class="container-block-title">Interests</h2>
-<ul class="list-unstyled interests-list">
-<li>Climbing</li>
-<li>Snowboarding</li>
-<li>Cooking</li>
-</ul>
+
+  <h2 class="container-block-title">Interests</h2>
+
+    <ul class="list-unstyled interests-list">
+      {% for interest in site.data.interests %}
+      <li>{{ interest.item }}</li>
+      {% endfor %}
+    </ul>
+
 </div><!--//interests-->
+{% endif %}
diff --git a/_includes/language.html b/_includes/language.html
index 7435d97..aa5ca9d 100644
--- a/_includes/language.html
+++ b/_includes/language.html
@@ -1,8 +1,13 @@
+{% if site.data.languages %}
 <div class="languages-container container-block">
-<h2 class="container-block-title">Languages</h2>
-<ul class="list-unstyled interests-list">
-<li>English <span class="lang-desc">(Native)</span></li>
-<li>French <span class="lang-desc">(Professional)</span></li>
-<li>Spanish <span class="lang-desc">(Professional)</span></li>
-</ul>
-</div><!--//interests-->
\ No newline at end of file
+
+  <h2 class="container-block-title">Languages</h2>
+
+    <ul class="list-unstyled interests-list">
+      {%for language in site.data.languages %}
+      <li>{{ language.idiom }} <span class="lang-desc">({{ language.level }})</span></li>
+      {% endfor %}
+    </ul>
+
+</div><!--//interests-->
+{% endif %}