diff --git a/layouts/shortcodes/attachedFigure.html b/layouts/shortcodes/attachedFigure.html
new file mode 100644
index 0000000..a02f8fa
--- /dev/null
+++ b/layouts/shortcodes/attachedFigure.html
@@ -0,0 +1,11 @@
+<!-- This shortcode renders an HTML figure based on a page resource -->
+{{ $filename := .Get "src" }}
+{{ $image := .Page.Resources.GetMatch (printf "%s" $filename) }}
+<figure>
+  <img src="{{ $image.Permalink }}">
+  {{ with .Get "title" }}
+  <figcaption>
+    {{ . }}
+  </figcaption>
+  {{ end }}
+</figure>
\ No newline at end of file
diff --git a/layouts/shortcodes/figure.html b/layouts/shortcodes/figure.html
new file mode 100644
index 0000000..8c2ea6d
--- /dev/null
+++ b/layouts/shortcodes/figure.html
@@ -0,0 +1,10 @@
+<!-- This shortcode renders an HTML figure based on a file dropped in the /public folder -->
+{{ $url := .Get "src" }}
+<figure>
+  <img src="{{ $url }}">
+  {{ with .Get "title" }}
+  <figcaption>
+    {{ . }}
+  </figcaption>
+  {{ end }}
+</figure>
\ No newline at end of file