diff --git a/.gitignore b/.gitignore
index 9785597..aff690a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build
 .cache
+/cmake-build-debug/
diff --git a/daggy/include/daggy/MetaStore.hpp b/daggy/include/daggy/MetaStore.hpp
index ee0f5dc..3764bab 100644
--- a/daggy/include/daggy/MetaStore.hpp
+++ b/daggy/include/daggy/MetaStore.hpp
@@ -37,5 +37,6 @@ namespace daggy {
         virtual void updateDAGRun(DAGRunID rid, DAGState state) = 0;
 
         // Retrievals
+        virtual DAGRun & getDAGRun(DAGRunID) = 0;
     };
 }
diff --git a/daggy/include/daggy/Scheduler.hpp b/daggy/include/daggy/Scheduler.hpp
index 09901be..a3eff61 100644
--- a/daggy/include/daggy/Scheduler.hpp
+++ b/daggy/include/daggy/Scheduler.hpp
@@ -6,7 +6,7 @@
 #include <variant>
 
 #include "DAG.hpp"
-#include "Executor.hpp"
+#include "TaskExecutor.hpp"
 #include "DAGRun.hpp"
 #include "ThreadPool.hpp"
 
@@ -23,7 +23,7 @@ namespace daggy {
     public:
     public:
         Scheduler(
-                Executor &executor, size_t executorThreads = 30, size_t schedulerThreads = 10);
+                TaskExecutor &executor, size_t executorThreads = 30, size_t schedulerThreads = 10);
 
         ~Scheduler();
 
@@ -47,7 +47,7 @@ namespace daggy {
 
         std::unordered_map<std::string, DAGRun> runs_;
         std::vector<std::future<void>> futs_;
-        Executor &executor_;
+        TaskExecutor &executor_;
         ThreadPool schedulers_;
         ThreadPool executors_;
         std::unordered_map<std::string, std::future<void>> jobs;
diff --git a/daggy/include/daggy/Executor.hpp b/daggy/include/daggy/TaskExecutor.hpp
similarity index 89%
rename from daggy/include/daggy/Executor.hpp
rename to daggy/include/daggy/TaskExecutor.hpp
index 53243dc..565be6b 100644
--- a/daggy/include/daggy/Executor.hpp
+++ b/daggy/include/daggy/TaskExecutor.hpp
@@ -15,9 +15,9 @@
 */
 
 namespace daggy {
-    class Executor {
+    class TaskExecutor {
     public:
-        Executor() = default;
+        TaskExecutor() = default;
 
         virtual const std::string getName() const = 0;
 
diff --git a/daggy/include/daggy/executors/ForkingExecutor.hpp b/daggy/include/daggy/executors/ForkingTaskExecutor.hpp
similarity index 61%
rename from daggy/include/daggy/executors/ForkingExecutor.hpp
rename to daggy/include/daggy/executors/ForkingTaskExecutor.hpp
index 97d2016..f17e5cf 100644
--- a/daggy/include/daggy/executors/ForkingExecutor.hpp
+++ b/daggy/include/daggy/executors/ForkingTaskExecutor.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
 #include <iostream>
-#include "../Executor.hpp"
+#include "../TaskExecutor.hpp"
 
 namespace daggy {
     namespace executor {
-        class ForkingExecutor : public Executor {
+        class ForkingTaskExecutor : public TaskExecutor {
         public:
-            ForkingExecutor() = default;
+            ForkingTaskExecutor() = default;
 
-            const std::string getName() const override { return "ForkingExecutor"; }
+            const std::string getName() const override { return "ForkingTaskExecutor"; }
 
             AttemptRecord runCommand(std::vector<std::string> cmd) override;
         };
diff --git a/daggy/src/Scheduler.cpp b/daggy/src/Scheduler.cpp
index 64cb442..6c3fd07 100644
--- a/daggy/src/Scheduler.cpp
+++ b/daggy/src/Scheduler.cpp
@@ -3,7 +3,7 @@
 using namespace std::chrono_literals;
 
 namespace daggy {
-    Scheduler::Scheduler(Executor &executor, size_t executorThreads, size_t schedulerThreads)
+    Scheduler::Scheduler(TaskExecutor &executor, size_t executorThreads, size_t schedulerThreads)
             : executor_(executor), schedulers_(schedulerThreads), executors_(executorThreads) {}
 
 
diff --git a/daggy/src/executors/ForkingExecutor.cpp b/daggy/src/executors/ForkingTaskExecutor.cpp
similarity index 94%
rename from daggy/src/executors/ForkingExecutor.cpp
rename to daggy/src/executors/ForkingTaskExecutor.cpp
index 5c4b50b..9d612d2 100644
--- a/daggy/src/executors/ForkingExecutor.cpp
+++ b/daggy/src/executors/ForkingTaskExecutor.cpp
@@ -1,4 +1,4 @@
-#include <daggy/executors/ForkingExecutor.hpp>
+#include <daggy/executors/ForkingTaskExecutor.hpp>
 
 #include <array>
 #include <utility>
@@ -34,7 +34,7 @@ std::string slurp(int fd) {
 }
 
 daggy::AttemptRecord
-ForkingExecutor::runCommand(std::vector<std::string> cmd) {
+ForkingTaskExecutor::runCommand(std::vector<std::string> cmd) {
     AttemptRecord rec;
 
     rec.startTime = Clock::now();
diff --git a/tests/unit_executor_forkingexecutor.cpp b/tests/unit_executor_forkingexecutor.cpp
index 86a0fa0..1fe3b42 100644
--- a/tests/unit_executor_forkingexecutor.cpp
+++ b/tests/unit_executor_forkingexecutor.cpp
@@ -1,12 +1,12 @@
 #include <iostream>
 #include <filesystem>
 
-#include "daggy/executors/ForkingExecutor.hpp"
+#include "daggy/executors/ForkingTaskExecutor.hpp"
 
 #include "catch.hpp"
 
 TEST_CASE("Basic Execution", "[forking_executor]") {
-  daggy::executor::ForkingExecutor ex;
+  daggy::executor::ForkingTaskExecutor ex;
 
   SECTION("Simple Run") {
     std::vector<std::string> cmd{"/usr/bin/echo", "abc", "123"};
diff --git a/tests/unit_scheduler.cpp b/tests/unit_scheduler.cpp
index 5e5a9f7..25cd03a 100644
--- a/tests/unit_scheduler.cpp
+++ b/tests/unit_scheduler.cpp
@@ -1,13 +1,13 @@
 #include <iostream>
 #include <filesystem>
 
-#include "daggy/executors/ForkingExecutor.hpp"
+#include "daggy/executors/ForkingTaskExecutor.hpp"
 #include "daggy/Scheduler.hpp"
 
 #include "catch.hpp"
 
 TEST_CASE("Basic Scheduler Execution", "[scheduler]") {
-  daggy::executor::ForkingExecutor ex;
+  daggy::executor::ForkingTaskExecutor ex;
   daggy::Scheduler sched(ex);
 
   std::vector<daggy::Task> tasks {