diff --git a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h
index f0cab8171e..86d360c23e 100644
--- a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h
+++ b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.h
@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_CommonTools_InterruptableCommands_H
 #define PokemonAutomation_CommonTools_InterruptableCommands_H
 
-#include <functional>
+#include "Common/Cpp/MoveOnlyFunction.h"
 #include "Common/Cpp/Concurrency/Mutex.h"
 #include "Common/Cpp/Concurrency/ConditionVariable.h"
 #include "Common/Cpp/Concurrency/AsyncTask.h"
@@ -44,7 +44,7 @@ class AsyncCommandSession final : private Cancellable{
     //  previous `dispatch()` while a new `dispatch()` presses button A and button B
     //  at the same time, button A is not released during the transition.
     //  You can use it to adjust button state continuously without interruption.
-    void dispatch(std::function<void(ControllerContextType&)>&& lambda);
+    void dispatch(MoveOnlyFunction<void(ControllerContextType&)>&& lambda);
 
     //  Wait for currently running command to finish.
     void wait();
diff --git a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp
index 193dad2d9b..bc96bbc675 100644
--- a/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp
+++ b/SerialPrograms/Source/CommonTools/Async/InterruptableCommands.tpp
@@ -21,11 +21,11 @@ template <typename ControllerType>
 struct AsyncCommandSession<ControllerType>::CommandSet{
     CommandSet(
         CancellableScope& parent, ControllerType& controller,
-        std::function<void(ControllerContextType&)>&& lambda
+        MoveOnlyFunction<void(ControllerContextType&)>&& lambda
     );
     CancellableHolder<CancellableScope> scope;
     ControllerContextType context;
-    std::function<void(ControllerContextType&)> commands;
+    MoveOnlyFunction<void(ControllerContextType&)> commands;
 };
 
 
@@ -33,7 +33,7 @@ struct AsyncCommandSession<ControllerType>::CommandSet{
 template <typename ControllerType>
 AsyncCommandSession<ControllerType>::CommandSet::CommandSet(
     CancellableScope& parent, ControllerType& controller,
-    std::function<void(ControllerContextType&)>&& lambda
+    MoveOnlyFunction<void(ControllerContextType&)>&& lambda
 )
     : scope(parent)
     , context(scope, controller)
@@ -97,7 +97,7 @@ void AsyncCommandSession<ControllerType>::stop_command(){
     }
 }
 template <typename ControllerType>
-void AsyncCommandSession<ControllerType>::dispatch(std::function<void(ControllerContextType&)>&& lambda){
+void AsyncCommandSession<ControllerType>::dispatch(MoveOnlyFunction<void(ControllerContextType&)>&& lambda){
     auto scope_check = m_sanitizer.check_scope();
 
     //  Construct the CommandSet outside the lock.
diff --git a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
index 62d5ec99e3..b13532bf23 100644
--- a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.h
@@ -11,7 +11,7 @@
 #include <vector>
 #include <map>
 #include <chrono>
-#include <functional>
+#include "Common/Cpp/MoveOnlyFunction.h"
 #include "Common/Cpp/Time.h"
 
 namespace PokemonAutomation{
@@ -58,7 +58,7 @@ class SuperControlSession{
     void operator+=(VisualInferenceCallback& callback);
     void operator+=(AudioInferenceCallback& callback);
 
-    void register_state_command(size_t state, std::function<bool()>&& action);
+    void register_state_command(size_t state, MoveOnlyFunction<bool()>&& action);
 
 
 protected:
@@ -91,7 +91,7 @@ class SuperControlSession{
     std::vector<AudioInferenceCallback*> m_audio_callbacks;
 
     //  These are actions
-    std::map<size_t, std::function<bool()>> m_state_actions;
+    std::map<size_t, MoveOnlyFunction<bool()>> m_state_actions;
 
 private:
     //  Run-time state.
diff --git a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp
index c8343ecf0e..a5fae0b94e 100644
--- a/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp
+++ b/SerialPrograms/Source/CommonTools/Async/SuperControlSession.tpp
@@ -49,7 +49,7 @@ void SuperControlSession<ControllerType>::operator+=(AudioInferenceCallback& cal
     m_audio_callbacks.emplace_back(&callback);
 }
 template <typename ControllerType>
-void SuperControlSession<ControllerType>::register_state_command(size_t state, std::function<bool()>&& action){
+void SuperControlSession<ControllerType>::register_state_command(size_t state, MoveOnlyFunction<bool()>&& action){
     auto iter = m_state_actions.find(state);
     if (iter != m_state_actions.end()){
         throw InternalProgramError(&m_stream.logger(), PA_CURRENT_FUNCTION, "Duplicate State Enum: " + std::to_string(state));
diff --git a/SerialPrograms/Source/CommonTools/DetectionDebouncer.h b/SerialPrograms/Source/CommonTools/DetectionDebouncer.h
index ee4f41cf24..6b071efe88 100644
--- a/SerialPrograms/Source/CommonTools/DetectionDebouncer.h
+++ b/SerialPrograms/Source/CommonTools/DetectionDebouncer.h
@@ -7,8 +7,8 @@
 #ifndef PokemonAutomation_CommonTools_DetectionDebouncer_H
 #define PokemonAutomation_CommonTools_DetectionDebouncer_H
 
-#include <functional>
 #include <atomic>
+#include "Common/Cpp/MoveOnlyFunction.h"
 #include "Common/Cpp/Time.h"
 
 namespace PokemonAutomation{
@@ -20,7 +20,7 @@ class DetectionDebouncer{
     DetectionDebouncer(
         Type initial_state,
         std::chrono::milliseconds min_streak,
-        std::function<void(Type)>&& state_reporter
+        MoveOnlyFunction<void(Type)>&& state_reporter
     )
         : m_min_streak(min_streak)
         , m_state_reporter(std::move(state_reporter))
@@ -57,7 +57,7 @@ class DetectionDebouncer{
 
 private:
     std::chrono::milliseconds m_min_streak;
-    std::function<void(Type)> m_state_reporter;
+    MoveOnlyFunction<void(Type)> m_state_reporter;
 
     std::atomic<Type> m_current_reported;
     WallClock m_last_match;
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
index 370b76c572..d3fe64694e 100644
--- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_EscapeFromAttack.h
@@ -46,7 +46,7 @@ class EscapeFromAttack : public SuperControlSession<ProController>{
         GET_ON_SNEASLER,
         CLIMBING,
     };
-    void register_state_command(State state, std::function<bool()>&& action){
+    void register_state_command(State state, MoveOnlyFunction<bool()>&& action){
         SuperControlSession::register_state_command((size_t)state, std::move(action));
     }
     bool run_state_action(State state){
diff --git a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
index 3a5c1ddd8e..8c2d10cd60 100644
--- a/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
+++ b/SerialPrograms/Source/VideoGames/PokemonLA/Programs/PokemonLA_FlagNavigationAir.h
@@ -62,7 +62,7 @@ class FlagNavigationAir : public SuperControlSession<ProController>{
         TURN_RIGHT,
         FIND_FLAG,
     };
-    void register_state_command(State state, std::function<bool()>&& action){
+    void register_state_command(State state, MoveOnlyFunction<bool()>&& action){
         SuperControlSession::register_state_command((size_t)state, std::move(action));
     }
     bool run_state_action(State state){
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
index 2ca84ccb49..adabbccbf2 100644
--- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.cpp
@@ -181,13 +181,13 @@ LetsGoKillWatcher::LetsGoKillWatcher(
     Logger& logger,
     Color color, bool trigger_if_detected,
     const ImageFloatBox& box,
-    std::function<void()> on_kill_callback,
+    MoveOnlyFunction<void()> on_kill_callback,
     std::chrono::milliseconds duration
 )
      : DetectorToFinder("LetsGoKillWatcher", duration, color, box)
      , m_logger(logger)
      , m_trigger_if_detected(trigger_if_detected)
-     , m_on_kill_callback(on_kill_callback)
+     , m_on_kill_callback(std::move(on_kill_callback))
      , m_last_detection(false)
      , m_last_detected(WallClock::min())
 {}
diff --git a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
index dde7152198..985e0f4359 100644
--- a/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
+++ b/SerialPrograms/Source/VideoGames/PokemonSV/Inference/Overworld/PokemonSV_LetsGoKillDetector.h
@@ -7,9 +7,9 @@
 #ifndef PokemonAutomation_PokemonSV_LetsGoKillDetector_H
 #define PokemonAutomation_PokemonSV_LetsGoKillDetector_H
 
-#include <functional>
 #include <atomic>
 #include "Common/Cpp/Color.h"
+#include "Common/Cpp/MoveOnlyFunction.h"
 #include "Common/Cpp/TestRunners/UnitTestDatabase.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonTools/Audio/AudioPerSpectrumDetectorBase.h"
@@ -39,7 +39,7 @@ class LetsGoKillWatcher : public DetectorToFinder<LetsGoKillDetector>{
         Logger& logger,
         Color color, bool trigger_if_detected = true,
         const ImageFloatBox& box = {0.71, 0.15, 0.04, 0.08},
-        std::function<void()> on_kill_callback = nullptr,
+        MoveOnlyFunction<void()> on_kill_callback = nullptr,
         std::chrono::milliseconds duration = std::chrono::milliseconds(250)
     );
 
@@ -52,7 +52,7 @@ class LetsGoKillWatcher : public DetectorToFinder<LetsGoKillDetector>{
 private:
     Logger& m_logger;
     bool m_trigger_if_detected;
-    std::function<void()> m_on_kill_callback;
+    MoveOnlyFunction<void()> m_on_kill_callback;
 
     bool m_last_detection;
     std::atomic<WallClock> m_last_detected;