diff --git a/eleventy.config.drafts.js b/eleventy.config.drafts.js
new file mode 100644
index 0000000..2de748f
--- /dev/null
+++ b/eleventy.config.drafts.js
@@ -0,0 +1,51 @@
+function eleventyComputedPermalink() {
+	// When using `addGlobalData` and you *want* to return a function, you must nest functions like this.
+	// `addGlobalData` acts like a global data file and runs the top level function it receives.
+	return (data) => {
+		// Always skip during non-watch/serve builds
+		if(data.draft && !process.env.BUILD_DRAFTS) {
+			return false;
+		}
+
+		return data.permalink;
+	}
+};
+
+function eleventyComputedExcludeFromCollections() {
+	// When using `addGlobalData` and you *want* to return a function, you must nest functions like this.
+	// `addGlobalData` acts like a global data file and runs the top level function it receives.
+	return (data) => {
+		// Always exclude from non-watch/serve builds
+		if(data.draft && !process.env.BUILD_DRAFTS) {
+			return true;
+		}
+
+		return data.eleventyExcludeFromCollections;
+	}
+};
+
+module.exports.eleventyComputedPermalink = eleventyComputedPermalink;
+module.exports.eleventyComputedExcludeFromCollections = eleventyComputedExcludeFromCollections;
+
+module.exports = eleventyConfig => {
+	eleventyConfig.addGlobalData("eleventyComputed.permalink", eleventyComputedPermalink);
+	eleventyConfig.addGlobalData("eleventyComputed.eleventyExcludeFromCollections", eleventyComputedExcludeFromCollections);
+
+	let logged = false;
+	eleventyConfig.on("eleventy.before", ({runMode}) => {
+		let text = "Excluding";
+
+		if(process.env.BUILD_DRAFTS == "true") {
+			process.env.BUILD_DRAFTS = true;
+			text = "Including";
+		}
+
+		// Only log once.
+		if(!logged) {
+			console.log(process.env.BUILD_DRAFTS, typeof(process.env.BUILD_DRAFTS));
+			console.log( `[11ty/drafts] ${text} drafts.` );
+		}
+
+		logged = true;
+	});
+}
diff --git a/eleventy.config.js b/eleventy.config.js
index 04325ea..b679c51 100644
--- a/eleventy.config.js
+++ b/eleventy.config.js
@@ -5,6 +5,7 @@ const mdDefList = require("markdown-it-deflist");
 const mdToc = require("markdown-it-table-of-contents");
 const mdAnchor = require("markdown-it-anchor");
 const eleventyRss = require("@11ty/eleventy-plugin-rss");
+const eleventyDrafts = require("./eleventy.config.drafts");
 
 module.exports = function (eleventyConfig) {
 	eleventyConfig.setBrowserSyncConfig({
@@ -21,6 +22,7 @@ module.exports = function (eleventyConfig) {
 	eleventyConfig.addPlugin(eleventyNavigationPlugin);
 	eleventyConfig.addPlugin(eleventySyntaxHighlight);
 	eleventyConfig.addPlugin(eleventyRss);
+	eleventyConfig.addPlugin(eleventyDrafts);
 	eleventyConfig.addPlugin(eleventySass, {
 		sass: {
 			loadPaths: ["node_modules"],
@@ -55,19 +57,6 @@ module.exports = function (eleventyConfig) {
 	eleventyConfig.addFilter("orderBySectionOrder", (collection) =>
 		collection.sort((a, b) => a.data.sectionOrder - b.data.sectionOrder)
 	);
-	eleventyConfig.addFilter("filterDrafts", collection => {
-		if (process.env.BUILD_DRAFTS == true || process.env.BUILD_DRAFTS == null) {
-			return collection;
-		}
-
-		return collection.filter(item => {
-			if (item.data.draft != null) {
-				return !item.data.draft;
-			}
-
-			return true;
-		});
-	});
 	eleventyConfig.addFilter("log", (value) => console.log(value));
 
 	return {
diff --git a/src/_includes/layouts/layout.njk b/src/_includes/layouts/layout.njk
index 590d40c..0f73623 100644
--- a/src/_includes/layouts/layout.njk
+++ b/src/_includes/layouts/layout.njk
@@ -24,7 +24,7 @@
 	<header>
 		<nav class="navbar" aria-label="Main Menu">
 			<ul class="siteNav">
-				{% for section in collections.MainPage | filterDrafts | eleventyNavigation %}
+				{% for section in collections.MainPage | eleventyNavigation %}
 					<li {% if section.url == page.url %}class="active"{% endif %}>
 						<a href="/#{{ section.title | slugify }}">
 							{% if section.icon is defined %}
@@ -37,7 +37,7 @@
 					</li>
 				{% endfor %}
 
-				{% set standalonePages = collections.all | filterDrafts | IsNotMainPageSection | eleventyNavigation %}
+				{% set standalonePages = collections.all | IsNotMainPageSection | eleventyNavigation %}
 
 				{% if standalonePages | length %}
 
diff --git a/src/_includes/posts-list.njk b/src/_includes/posts-list.njk
index 4688aa4..40df637 100644
--- a/src/_includes/posts-list.njk
+++ b/src/_includes/posts-list.njk
@@ -1,5 +1,5 @@
-{% if postsList | filterDrafts | IsNotPage(page.url) | length %}
-	{% for post in postsList | filterDrafts | reverse %}
+{% if postsList | length %}
+	{% for post in postsList | reverse %}
 		<section class="posts-list-post">
 			<h2><a href={{ post.url }}>{{ post.data.title }}</a></h2>
 			<dl class="postMetadata">
diff --git a/src/feed.njk b/src/feed.njk
index 4510ef7..4cf5c78 100644
--- a/src/feed.njk
+++ b/src/feed.njk
@@ -19,7 +19,7 @@ metadata:
 	<author>
 		<name>{{ metadata.author.name }}</name>
 	</author>
-	{%- for post in collections.posts | filterDrafts | IsNotPage("/posts/") | reverse %}
+	{%- for post in collections.posts | reverse %}
 		{%- set absolutePostUrl = post.url | absoluteUrl(metadata.url) %}
 		<entry>
 			<title>{{ post.data.title }}</title>
diff --git a/src/index.njk b/src/index.njk
index 70b79d7..2e7cf59 100644
--- a/src/index.njk
+++ b/src/index.njk
@@ -7,7 +7,7 @@ eleventyNavigation:
 tags: [ "MainPage" ]
 ---
 
-{% for section in collections.MainPage | filterDrafts | IsNotPage(page.url) | IsMainPageSection | orderBySectionOrder %}
+{% for section in collections.MainPage | IsNotPage(page.url) | IsMainPageSection | orderBySectionOrder %}
 	{% if not loop.first %}
 		<h2 id="{{ section.data.title | slugify }}">{{ section.data.title }}</h2>
 	{% endif %}
diff --git a/src/posts.njk b/src/posts.njk
index b6ae4d6..5952501 100644
--- a/src/posts.njk
+++ b/src/posts.njk
@@ -7,5 +7,5 @@ eleventyNavigation:
   order: 1
 ---
 
-{% set postsList = collections.posts | filterDrafts | IsNotPage(page.url) %}
+{% set postsList = collections.posts %}
 {% include "posts-list.njk" %}