diff --git a/src/Makefile.am b/src/Makefile.am
index a0eca537b48d..f01a67d1adde 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -230,14 +230,12 @@ BITCOIN_CORE_H = \
   evo/types.h \
   external_signer.h \
   dsnotificationinterface.h \
-  governance/classes.h \
   governance/common.h \
-  governance/exceptions.h \
   governance/governance.h \
   governance/net_governance.h \
   governance/object.h \
   governance/signing.h \
-  governance/validators.h \
+  governance/superblock.h \
   governance/vote.h \
   governance/votedb.h \
   gsl/assert.h \
@@ -521,13 +519,11 @@ libbitcoin_node_a_SOURCES = \
   evo/specialtx_filter.cpp \
   evo/specialtxman.cpp \
   flatfile.cpp \
-  governance/classes.cpp \
-  governance/exceptions.cpp \
   governance/governance.cpp \
   governance/net_governance.cpp \
   governance/object.cpp \
   governance/signing.cpp \
-  governance/validators.cpp \
+  governance/superblock.cpp \
   governance/vote.cpp \
   governance/votedb.cpp \
   gsl/assert.cpp \
diff --git a/src/active/context.cpp b/src/active/context.cpp
index c89162df6a7e..4479c6653fa8 100644
--- a/src/active/context.cpp
+++ b/src/active/context.cpp
@@ -12,6 +12,7 @@
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
 #include <governance/signing.h>
+#include <governance/superblock.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/signing.h>
 #include <llmq/debug.h>
@@ -26,7 +27,8 @@
 #include <validationinterface.h>
 
 ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
-                             CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
+                             CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                             governance::SuperblockManager& superblocks, CMasternodeMetaMan& mn_metaman,
                              CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
                              chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,
                              llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumManager& qman,
@@ -40,7 +42,7 @@ ActiveContext::ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman
     dkgdbgman{std::make_unique<llmq::CDKGDebugManager>(dmnman, qsnapman, chainman)},
     qdkgsman{std::make_unique<llmq::CDKGSessionManager>(dmnman, qsnapman, chainman, sporkman, db_params, quorums_watch)},
     shareman{std::make_unique<llmq::CSigSharesManager>(connman, chainman, sigman, *nodeman, qman, sporkman)},
-    gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, *nodeman, chainman, mn_sync)},
+    gov_signer{std::make_unique<GovernanceSigner>(connman, dmnman, govman, superblocks, *nodeman, chainman, mn_sync)},
     ehf_sighandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, sigman, *shareman, qman)},
     cl_signer{std::make_unique<chainlock::ChainLockSigner>(chainman.ActiveChainstate(), chainlocks, clhandler, isman,
                                                            qman, sigman, *shareman, mn_sync)},
diff --git a/src/active/context.h b/src/active/context.h
index 44b71abc8af7..af41ec7bfc84 100644
--- a/src/active/context.h
+++ b/src/active/context.h
@@ -31,6 +31,9 @@ class Chainlocks;
 class ChainlockHandler;
 class ChainLockSigner;
 } // namespace chainlock
+namespace governance {
+class SuperblockManager;
+} // namespace governance
 namespace instantsend {
 class InstantSendSigner;
 } // namespace instantsend
@@ -55,7 +58,8 @@ struct ActiveContext final : public llmq::QuorumRole, public CValidationInterfac
     ActiveContext(const ActiveContext&) = delete;
     ActiveContext& operator=(const ActiveContext&) = delete;
     explicit ActiveContext(CBLSWorker& bls_worker, ChainstateManager& chainman, CConnman& connman,
-                           CDeterministicMNManager& dmnman, CGovernanceManager& govman, CMasternodeMetaMan& mn_metaman,
+                           CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                           governance::SuperblockManager& superblocks, CMasternodeMetaMan& mn_metaman,
                            CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks, CTxMemPool& mempool,
                            chainlock::ChainlockHandler& clhandler, llmq::CInstantSendManager& isman,
                            llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumManager& qman,
diff --git a/src/evo/chainhelper.cpp b/src/evo/chainhelper.cpp
index 63c6fdafd2a7..bffb8d1e43fc 100644
--- a/src/evo/chainhelper.cpp
+++ b/src/evo/chainhelper.cpp
@@ -10,20 +10,22 @@
 #include <evo/creditpool.h>
 #include <evo/mnhftx.h>
 #include <evo/specialtxman.h>
+#include <governance/superblock.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
 #include <masternode/payments.h>
 
-CChainstateHelper::CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
-                                     llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
-                                     llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
-                                     const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
-                                     const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman) :
+CChainstateHelper::CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, llmq::CInstantSendManager& isman,
+                                     llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumSnapshotManager& qsnapman,
+                                     const ChainstateManager& chainman, const Consensus::Params& consensus_params,
+                                     const CMasternodeSync& mn_sync, const chainlock::Chainlocks& chainlocks,
+                                     const llmq::CQuorumManager& qman) :
     isman{isman},
     credit_pool_manager{std::make_unique<CCreditPoolManager>(evodb, chainman)},
     m_chainlocks{chainlocks},
     ehf_manager{std::make_unique<CMNHFManager>(evodb, chainman, qman)},
-    mn_payments{std::make_unique<CMNPaymentsProcessor>(dmnman, govman, chainman, consensus_params, mn_sync)},
+    superblocks{std::make_unique<governance::SuperblockManager>()},
+    mn_payments{std::make_unique<CMNPaymentsProcessor>(dmnman, *superblocks, chainman, consensus_params, mn_sync)},
     special_tx{std::make_unique<CSpecialTxProcessor>(*credit_pool_manager, dmnman, *ehf_manager, qblockman, qsnapman,
                                                      chainman, consensus_params, chainlocks, qman)}
 {}
diff --git a/src/evo/chainhelper.h b/src/evo/chainhelper.h
index ec129d30df2b..08e5d8eb482b 100644
--- a/src/evo/chainhelper.h
+++ b/src/evo/chainhelper.h
@@ -13,7 +13,6 @@ class CBlockIndex;
 class CCreditPoolManager;
 class CDeterministicMNManager;
 class CEvoDB;
-class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
 class CMNHFManager;
@@ -25,6 +24,9 @@ struct CCreditPool;
 namespace chainlock {
 class Chainlocks;
 } // namespace chainlock
+namespace governance {
+class SuperblockManager;
+} // namespace governance
 namespace Consensus {
 struct Params;
 } // namespace Consensus
@@ -43,6 +45,7 @@ class CChainstateHelper
     const std::unique_ptr<CCreditPoolManager> credit_pool_manager;
     const chainlock::Chainlocks& m_chainlocks;
     const std::unique_ptr<CMNHFManager> ehf_manager;
+    const std::unique_ptr<governance::SuperblockManager> superblocks;
     const std::unique_ptr<CMNPaymentsProcessor> mn_payments;
     const std::unique_ptr<CSpecialTxProcessor> special_tx;
 
@@ -50,11 +53,11 @@ class CChainstateHelper
     CChainstateHelper() = delete;
     CChainstateHelper(const CChainstateHelper&) = delete;
     CChainstateHelper& operator=(const CChainstateHelper&) = delete;
-    explicit CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
-                               llmq::CInstantSendManager& isman, llmq::CQuorumBlockProcessor& qblockman,
-                               llmq::CQuorumSnapshotManager& qsnapman, const ChainstateManager& chainman,
-                               const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync,
-                               const chainlock::Chainlocks& chainlocks, const llmq::CQuorumManager& qman);
+    explicit CChainstateHelper(CEvoDB& evodb, CDeterministicMNManager& dmnman, llmq::CInstantSendManager& isman,
+                               llmq::CQuorumBlockProcessor& qblockman, llmq::CQuorumSnapshotManager& qsnapman,
+                               const ChainstateManager& chainman, const Consensus::Params& consensus_params,
+                               const CMasternodeSync& mn_sync, const chainlock::Chainlocks& chainlocks,
+                               const llmq::CQuorumManager& qman);
     ~CChainstateHelper();
 
     /** Passthrough functions to chainlock::Chainlocks */
diff --git a/src/governance/classes.h b/src/governance/classes.h
deleted file mode 100644
index 3994ca37b2b5..000000000000
--- a/src/governance/classes.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2014-2025 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_GOVERNANCE_CLASSES_H
-#define BITCOIN_GOVERNANCE_CLASSES_H
-
-#include <consensus/amount.h>
-#include <governance/object.h>
-#include <script/script.h>
-#include <script/standard.h>
-#include <uint256.h>
-
-#include <memory>
-#include <string>
-#include <vector>
-
-class CChain;
-class CSuperblock;
-class CTxOut;
-class CTransaction;
-
-using CSuperblock_sptr = std::shared_ptr<CSuperblock>;
-
-CAmount ParsePaymentAmount(const std::string& strAmount);
-
-/**
-*   Governance Object Payment
-*
-*/
-
-class CGovernancePayment
-{
-private:
-    bool fValid;
-
-public:
-    CScript script;
-    CAmount nAmount;
-    uint256 proposalHash;
-
-    CGovernancePayment() :
-        fValid(false),
-        script(),
-        nAmount(0),
-        proposalHash(0)
-    {
-    }
-
-    CGovernancePayment(const CTxDestination& destIn, CAmount nAmountIn, const uint256& proposalHash);
-
-    bool IsValid() const { return fValid; }
-};
-
-
-/**
-*   Trigger : Superblock
-*
-*   - Create payments on the network
-*
-*   object structure:
-*   {
-*       "governance_object_id" : last_id,
-*       "type" : govtypes.trigger,
-*       "subtype" : "superblock",
-*       "superblock_name" : superblock_name,
-*       "start_epoch" : start_epoch,
-*       "payment_addresses" : "addr1|addr2|addr3",
-*       "payment_amounts"   : "amount1|amount2|amount3"
-*   }
-*/
-
-class CSuperblock : public CGovernanceObject
-{
-private:
-    uint256 nGovObjHash;
-
-    int nBlockHeight;
-    SeenObjectStatus nStatus;
-    std::vector<CGovernancePayment> vecPayments;
-
-    void ParsePaymentSchedule(const std::string& strPaymentAddresses, const std::string& strPaymentAmounts, const std::string& strProposalHashes);
-
-public:
-    CSuperblock();
-    CSuperblock(int nBlockHeight, std::vector<CGovernancePayment> vecPayments);
-    explicit CSuperblock(const CGovernanceObject& obj, uint256& nHash);
-
-    static bool IsValidBlockHeight(int nBlockHeight);
-    static void GetNearestSuperblocksHeights(int nBlockHeight, int& nLastSuperblockRet, int& nNextSuperblockRet);
-    static CAmount GetPaymentsLimit(const CChain& active_chain, int nBlockHeight);
-
-    SeenObjectStatus GetStatus() const { return nStatus; }
-    void SetStatus(SeenObjectStatus nStatusIn) { nStatus = nStatusIn; }
-
-    std::string GetHexStrData() const;
-
-    // TELL THE ENGINE WE EXECUTED THIS EVENT
-    void SetExecuted() { nStatus = SeenObjectStatus::Executed; }
-
-    int GetBlockHeight() const
-    {
-        return nBlockHeight;
-    }
-
-    uint256 GetGovernanceObjHash() const { return nGovObjHash; }
-
-    int CountPayments() const { return (int)vecPayments.size(); }
-    bool GetPayment(int nPaymentIndex, CGovernancePayment& paymentRet);
-    CAmount GetPaymentsTotalAmount();
-
-    bool IsValid(const CChain& active_chain, const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
-    bool IsExpired(int heightToTest) const;
-
-    std::vector<uint256> GetProposalHashes() const;
-};
-
-#endif // BITCOIN_GOVERNANCE_CLASSES_H
diff --git a/src/governance/core_write.cpp b/src/governance/core_write.cpp
index 3fab5b078030..4d90dd269c44 100644
--- a/src/governance/core_write.cpp
+++ b/src/governance/core_write.cpp
@@ -2,11 +2,12 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include <core_io.h>
 #include <governance/common.h>
 #include <governance/governance.h>
-
-#include <core_io.h>
+#include <governance/object.h>
 #include <rpc/util.h>
+#include <tinyformat.h>
 #include <util/check.h>
 
 #include <univalue.h>
diff --git a/src/governance/exceptions.cpp b/src/governance/exceptions.cpp
deleted file mode 100644
index e24f24868927..000000000000
--- a/src/governance/exceptions.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) 2023-2025 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <governance/exceptions.h>
-#include <tinyformat.h>
-
-#include <iostream>
-
-std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType)
-{
-    switch (eType) {
-    case GOVERNANCE_EXCEPTION_NONE:
-        os << "GOVERNANCE_EXCEPTION_NONE";
-        break;
-    case GOVERNANCE_EXCEPTION_WARNING:
-        os << "GOVERNANCE_EXCEPTION_WARNING";
-        break;
-    case GOVERNANCE_EXCEPTION_PERMANENT_ERROR:
-        os << "GOVERNANCE_EXCEPTION_PERMANENT_ERROR";
-        break;
-    case GOVERNANCE_EXCEPTION_TEMPORARY_ERROR:
-        os << "GOVERNANCE_EXCEPTION_TEMPORARY_ERROR";
-        break;
-    case GOVERNANCE_EXCEPTION_INTERNAL_ERROR:
-        os << "GOVERNANCE_EXCEPTION_INTERNAL_ERROR";
-        break;
-    }
-    return os;
-}
-
-CGovernanceException::CGovernanceException(const std::string& strMessageIn,
-                                           governance_exception_type_enum_t eTypeIn,
-                                           int nNodePenaltyIn) :
-    strMessage{strprintf("%s:%s", eTypeIn, strMessageIn)},
-    eType{eTypeIn},
-    nNodePenalty{nNodePenaltyIn}
-{
-}
diff --git a/src/governance/exceptions.h b/src/governance/exceptions.h
deleted file mode 100644
index 646a8b2b55a5..000000000000
--- a/src/governance/exceptions.h
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright (c) 2014-2023 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef BITCOIN_GOVERNANCE_EXCEPTIONS_H
-#define BITCOIN_GOVERNANCE_EXCEPTIONS_H
-
-#include <exception>
-#include <iosfwd> // for ostream
-#include <string>
-
-enum governance_exception_type_enum_t {
-    /// Default value, normally indicates no exception condition occurred
-    GOVERNANCE_EXCEPTION_NONE = 0,
-    /// Unusual condition requiring no caller action
-    GOVERNANCE_EXCEPTION_WARNING = 1,
-    /// Requested operation cannot be performed
-    GOVERNANCE_EXCEPTION_PERMANENT_ERROR = 2,
-    /// Requested operation not currently possible, may resubmit later
-    GOVERNANCE_EXCEPTION_TEMPORARY_ERROR = 3,
-    /// Unexpected error (ie. should not happen unless there is a bug in the code)
-    GOVERNANCE_EXCEPTION_INTERNAL_ERROR = 4
-};
-
-std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType);
-
-/**
- * A class which encapsulates information about a governance exception condition
- *
- * Derives from std::exception so is suitable for throwing
- * (ie. will be caught by a std::exception handler) but may also be used as a
- * normal object.
- */
-class CGovernanceException : public std::exception
-{
-private:
-    std::string strMessage;
-
-    governance_exception_type_enum_t eType;
-
-    int nNodePenalty;
-
-public:
-    explicit CGovernanceException(const std::string& strMessageIn = "",
-        governance_exception_type_enum_t eTypeIn = GOVERNANCE_EXCEPTION_NONE,
-        int nNodePenaltyIn = 0);
-
-    ~CGovernanceException() noexcept override = default;
-
-    const char* what() const noexcept override
-    {
-        return strMessage.c_str();
-    }
-
-    const std::string& GetMessage() const
-    {
-        return strMessage;
-    }
-
-    governance_exception_type_enum_t GetType() const
-    {
-        return eType;
-    }
-
-    int GetNodePenalty() const
-    {
-        return nNodePenalty;
-    }
-};
-
-#endif // BITCOIN_GOVERNANCE_EXCEPTIONS_H
diff --git a/src/governance/governance.cpp b/src/governance/governance.cpp
index b79a6b532ed2..05d0d103fd7e 100644
--- a/src/governance/governance.cpp
+++ b/src/governance/governance.cpp
@@ -6,9 +6,9 @@
 
 #include <evo/deterministicmns.h>
 #include <flat-database.h>
-#include <governance/classes.h>
 #include <governance/common.h>
-#include <governance/validators.h>
+#include <governance/object.h>
+#include <governance/superblock.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 
@@ -19,10 +19,8 @@
 #include <net.h>
 #include <node/interface_ui.h>
 #include <protocol.h>
-#include <shutdown.h>
 #include <timedata.h>
 #include <util/check.h>
-#include <util/thread.h>
 #include <util/time.h>
 #include <validationinterface.h>
 
@@ -65,23 +63,27 @@ GovernanceStore::GovernanceStore() :
 {
 }
 
-CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman,
-                                       const ChainstateManager& chainman,
-                                       const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync) :
+CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, const ChainstateManager& chainman,
+                                       governance::SuperblockManager& superblocks, CDeterministicMNManager& dmnman,
+                                       CMasternodeSync& mn_sync) :
     m_db{std::make_unique<db_type>("governance.dat", "magicGovernanceCache")},
     m_mn_metaman{mn_metaman},
     m_chainman{chainman},
+    m_superblocks{superblocks},
     m_dmnman{dmnman},
     m_mn_sync{mn_sync},
     cmapVoteToObject{MAX_CACHE_SIZE},
-    mapPostponedObjects{},
-    mapTrigger{}
+    mapPostponedObjects{}
 {
 }
 
 CGovernanceManager::~CGovernanceManager()
 {
-    if (!is_valid) return;
+    // Reset the paired SuperblockManager so its loaded-flag and trigger map don't
+    // outlive us. chain_helper (its owner) must outlive govman -- see PrepareShutdown
+    // in init.cpp and the test teardown ordering.
+    m_superblocks.Clear();
+    if (!is_loaded) return;
     m_db->Store(*this);
 }
 
@@ -89,12 +91,13 @@ bool CGovernanceManager::LoadCache(bool load_cache)
 {
     AssertLockNotHeld(cs_store);
     assert(m_db != nullptr);
-    is_valid = load_cache ? m_db->Load(*this) : m_db->Store(*this);
-    if (is_valid && load_cache) {
+    is_loaded = load_cache ? m_db->Load(*this) : m_db->Store(*this);
+    if (is_loaded && load_cache) {
         CheckAndRemove();
         InitOnLoad();
     }
-    return is_valid;
+    m_superblocks.SetLoaded(is_loaded);
+    return is_loaded;
 }
 
 void CGovernanceManager::RelayObject(const CGovernanceObject& obj)
@@ -117,7 +120,7 @@ void CGovernanceManager::RelayVote(const CGovernanceVote& vote)
         return;
     }
 
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     auto dmn = tip_mn_list.GetMNByCollateral(vote.GetMasternodeOutpoint());
     if (!dmn) {
         return;
@@ -203,7 +206,7 @@ bool CGovernanceManager::ProcessObject(const std::string& peer_str, const uint25
     std::string strError;
     // CHECK OBJECT AGAINST LOCAL BLOCKCHAIN
 
-    const auto tip_mn_list = GetMNManager().GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     bool fMissingConfirmations = false;
     bool fIsValid = govobj.IsValidLocally(tip_mn_list, m_chainman, strError, fMissingConfirmations, true);
 
@@ -243,14 +246,14 @@ void CGovernanceManager::CheckOrphanVotes(CGovernanceObject& govobj)
     ScopedLockBool guard(cs_store, fRateChecksEnabled, false);
 
     int64_t nNow = GetAdjustedTime();
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     for (const auto& pairVote : vecVotePairs) {
         const auto& [vote, time] = pairVote;
         bool fRemove = false;
         CGovernanceException e;
         if (time < nNow) {
             fRemove = true;
-        } else if (govobj.ProcessVote(m_mn_metaman, *this, tip_mn_list, vote, e)) {
+        } else if (govobj.ProcessVote(m_mn_metaman, fRateChecksEnabled, tip_mn_list, vote, e)) {
             RelayVote(vote);
             fRemove = true;
         }
@@ -269,7 +272,7 @@ void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_o
     uint256 nHash = insert_obj.GetHash();
     std::string strHash = nHash.ToString();
 
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
 
     // UPDATE CACHED VARIABLES FOR THIS OBJECT AND ADD IT TO OUR MANAGED DATA
 
@@ -302,7 +305,7 @@ void CGovernanceManager::AddGovernanceObjectInternal(CGovernanceObject& insert_o
     LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- Before trigger block, GetDataAsPlainString = %s, nObjectType = %d\n",
                 Assert(govobj)->GetDataAsPlainString(), std23::to_underlying(govobj->GetObjectType()));
 
-    if (govobj->GetObjectType() == GovernanceObject::TRIGGER && !AddNewTrigger(nHash)) {
+    if (govobj->GetObjectType() == GovernanceObject::TRIGGER && !m_superblocks.AddTrigger(govobj, nCachedBlockHeight)) {
         LogPrint(BCLog::GOBJECT, "CGovernanceManager::AddGovernanceObject -- undo adding invalid trigger object: hash = %s\n", nHash.ToString());
         govobj->PrepareDeletion(GetTime<std::chrono::seconds>().count());
         return;
@@ -343,7 +346,7 @@ void CGovernanceManager::CheckAndRemove()
 
     std::vector<uint256> vecDirtyHashes = m_mn_metaman.GetAndClearDirtyGovernanceObjectHashes();
 
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
 
     {
     LOCK2(::cs_main, cs_store);
@@ -359,7 +362,7 @@ void CGovernanceManager::CheckAndRemove()
     ScopedLockBool guard(cs_store, fRateChecksEnabled, false);
 
     // Clean up any expired or invalid triggers
-    CleanAndRemoveTriggers();
+    m_superblocks.Clean(nCachedBlockHeight);
 
     const auto nNow = GetTime<std::chrono::seconds>();
     for (auto it = mapObjects.begin(); it != mapObjects.end();) {
@@ -412,11 +415,14 @@ void CGovernanceManager::CheckAndRemove()
             }
 
             mapErasedGovernanceObjects.insert(std::make_pair(nHash, nTimeExpired));
+            if (pObj->GetObjectType() == GovernanceObject::TRIGGER) {
+                m_superblocks.RemoveTrigger(nHash);
+            }
             mapObjects.erase(it++);
         } else {
             if (pObj->GetObjectType() == GovernanceObject::PROPOSAL) {
-                CProposalValidator validator(pObj->GetDataAsHexString());
-                if (!validator.Validate()) {
+                std::string strValidationError;
+                if (!governance::ValidateProposal(pObj->GetDataAsHexString(), strValidationError)) {
                     LogPrint(BCLog::GOBJECT, "CGovernanceManager::UpdateCachesAndClean -- set for deletion expired obj %s\n", strHash);
                     pObj->PrepareDeletion(nNow.count());
                 }
@@ -506,7 +512,7 @@ std::vector<CGovernanceVote> CGovernanceManager::GetCurrentVotes(const uint256&
     if (it == mapObjects.end()) return vecResult;
     const auto& govobj = *Assert(it->second);
 
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     std::map<COutPoint, CDeterministicMNCPtr> mapMasternodes;
     if (mnCollateralOutpointFilter.IsNull()) {
         tip_mn_list.ForEachMNShared(/*onlyValid=*/false,
@@ -617,7 +623,7 @@ std::vector<CInv> CGovernanceManager::GetSyncableVoteInvs(const uint256& nProp,
     }
 
     std::vector<CInv> invs;
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
 
     LOCK(govobj.cs);
     const auto& fileVotes = govobj.GetVoteFile();
@@ -804,7 +810,7 @@ bool CGovernanceManager::ProcessVote(const CGovernanceVote& vote, CGovernanceExc
         return false;
     }
 
-    bool fOk = govobj.ProcessVote(m_mn_metaman, *this, Assert(m_dmnman)->GetListAtChainTip(), vote, exception);
+    bool fOk = govobj.ProcessVote(m_mn_metaman, fRateChecksEnabled, m_dmnman.GetListAtChainTip(), vote, exception);
     if (fOk) {
         fOk = cmapVoteToObject.Insert(nHashVote, it->second);
     } else if (exception.GetType() == GOVERNANCE_EXCEPTION_PERMANENT_ERROR && exception.GetNodePenalty() == 20) {
@@ -830,7 +836,7 @@ void CGovernanceManager::CheckPostponedObjects()
         std::string strError;
         bool fMissingConfirmations;
         if (govobj.IsCollateralValid(m_chainman, strError, fMissingConfirmations)) {
-            if (govobj.IsValidLocally(Assert(m_dmnman)->GetListAtChainTip(), m_chainman, strError, false)) {
+            if (govobj.IsValidLocally(m_dmnman.GetListAtChainTip(), m_chainman, strError, false)) {
                 AddGovernanceObjectInternal(govobj, "<postponed>");
             } else {
                 LogPrint(BCLog::GOBJECT, "CGovernanceManager::CheckPostponedObjects -- %s invalid\n", nHash.ToString());
@@ -901,7 +907,7 @@ CBloomFilter CGovernanceManager::GetVoteBloomFilter(const uint256& nHash) const
     return filter;
 }
 
-CDeterministicMNManager& CGovernanceManager::GetMNManager() { return *Assert(m_dmnman); }
+CDeterministicMNManager& CGovernanceManager::GetMNManager() { return m_dmnman; }
 
 std::pair<std::vector<uint256>, std::vector<uint256>> CGovernanceManager::FetchGovernanceObjectVotes(
     size_t nPeersPerHashMax, int64_t nNow, std::map<uint256, std::map<CService, int64_t>>& mapAskedRecently) const
@@ -962,23 +968,6 @@ void CGovernanceManager::RebuildIndexes()
     }
 }
 
-void CGovernanceManager::AddCachedTriggers()
-{
-    AssertLockHeld(cs_store);
-
-    int64_t nNow = GetTime<std::chrono::seconds>().count();
-
-    for (auto& [_, govobj] : mapObjects) {
-        if (Assert(govobj)->GetObjectType() != GovernanceObject::TRIGGER) {
-            continue;
-        }
-
-        if (!AddNewTrigger(govobj->GetHash())) {
-            govobj->PrepareDeletion(nNow);
-        }
-    }
-}
-
 void CGovernanceManager::InitOnLoad()
 {
     {
@@ -986,7 +975,14 @@ void CGovernanceManager::InitOnLoad()
     const auto start{SteadyClock::now()};
     LogPrintf("Preparing masternode indexes and governance triggers...\n");
     RebuildIndexes();
-    AddCachedTriggers();
+
+    const int64_t nNow = GetTime<std::chrono::seconds>().count();
+    for (auto& [_, govobj] : mapObjects) {
+        if (Assert(govobj)->GetObjectType() != GovernanceObject::TRIGGER) continue;
+        if (!m_superblocks.AddTrigger(govobj, nCachedBlockHeight)) {
+            govobj->PrepareDeletion(nNow);
+        }
+    }
     LogPrintf("Masternode indexes and governance triggers prepared  %dms\n",
               Ticks<std::chrono::milliseconds>(SteadyClock::now() - start));
     }
@@ -1016,7 +1012,7 @@ void CGovernanceManager::Clear()
     setAdditionalRelayObjects.clear();
     m_requested_hash_time.clear();
     fRateChecksEnabled = true;
-    mapTrigger.clear();
+    m_superblocks.Clear();
 }
 
 std::string GovernanceStore::ToString() const
@@ -1075,7 +1071,7 @@ void CGovernanceManager::UpdatedBlockTip(const CBlockIndex* pindex)
 
     CheckPostponedObjects();
 
-    ExecuteBestSuperblock(Assert(m_dmnman)->GetListAtChainTip(), pindex->nHeight);
+    m_superblocks.ExecuteBestSuperblock(m_dmnman.GetListAtChainTip(), pindex->nHeight);
 }
 
 std::vector<uint256> CGovernanceManager::GetOrphanVoteObjectHashes()
@@ -1116,7 +1112,7 @@ void CGovernanceManager::RemoveInvalidVotes()
         return;
     }
 
-    const auto tip_mn_list = Assert(m_dmnman)->GetListAtChainTip();
+    const auto tip_mn_list = m_dmnman.GetListAtChainTip();
     auto diff = lastMNListForVotingKeys->BuildDiff(tip_mn_list);
 
     std::vector<COutPoint> changedKeyMNs;
@@ -1158,307 +1154,6 @@ void CGovernanceManager::RemoveInvalidVotes()
     lastMNListForVotingKeys = std::make_shared<CDeterministicMNList>(tip_mn_list);
 }
 
-/**
- *   Add Governance Object
- */
-
-bool CGovernanceManager::AddNewTrigger(uint256 nHash)
-{
-    AssertLockHeld(cs_store);
-
-    // IF WE ALREADY HAVE THIS HASH, RETURN
-    if (mapTrigger.count(nHash)) {
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Already have hash, nHash = %s, count = %d, size = %s\n",
-                 __func__, nHash.GetHex(), mapTrigger.count(nHash), mapTrigger.size());
-        return false;
-    }
-
-    CSuperblock_sptr pSuperblock;
-    try {
-        auto pGovObj = FindGovernanceObjectInternal(nHash);
-        if (!pGovObj) {
-            throw std::runtime_error("CSuperblock: Failed to find Governance Object");
-        }
-        pSuperblock = std::make_shared<CSuperblock>(*pGovObj, nHash);
-    } catch (std::exception& e) {
-        LogPrintf("CGovernanceManager::%s -- Error creating superblock: %s\n", __func__, e.what());
-        return false;
-    } catch (...) {
-        LogPrintf("CGovernanceManager::%s -- Unknown Error creating superblock\n", __func__);
-        return false;
-    }
-
-    pSuperblock->SetStatus(SeenObjectStatus::Valid);
-
-    mapTrigger.insert(std::make_pair(nHash, pSuperblock));
-
-    return !pSuperblock->IsExpired(GetCachedBlockHeight());
-}
-
-/**
- *
- *   Clean And Remove
- *
- */
-
-void CGovernanceManager::CleanAndRemoveTriggers()
-{
-    AssertLockHeld(cs_store);
-
-    // Remove triggers that are invalid or expired
-    LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- mapTrigger.size() = %d\n", __func__, mapTrigger.size());
-
-    for (auto it = mapTrigger.begin(); it != mapTrigger.end();) {
-        bool remove = false;
-        std::shared_ptr<CGovernanceObject> pObj = nullptr;
-        const CSuperblock_sptr& pSuperblock = it->second;
-        if (!pSuperblock) {
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- nullptr superblock\n", __func__);
-            remove = true;
-        } else {
-            pObj = FindGovernanceObjectInternal(it->first);
-            if (!pObj || pObj->GetObjectType() != GovernanceObject::TRIGGER) {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Unknown or non-trigger superblock\n", __func__);
-                pSuperblock->SetStatus(SeenObjectStatus::ErrorInvalid);
-            }
-
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- superblock status = %d\n", __func__,
-                     std23::to_underlying(pSuperblock->GetStatus()));
-            switch (pSuperblock->GetStatus()) {
-            case SeenObjectStatus::ErrorInvalid:
-            case SeenObjectStatus::Unknown:
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Unknown or invalid trigger found\n", __func__);
-                remove = true;
-                break;
-            case SeenObjectStatus::Valid:
-            case SeenObjectStatus::Executed: {
-                LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Valid trigger found\n", __func__);
-                if (pSuperblock->IsExpired(GetCachedBlockHeight())) {
-                    // update corresponding object
-                    pObj->SetExpired();
-                    remove = true;
-                }
-                break;
-            }
-            default:
-                break;
-            }
-        }
-        LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- %smarked for removal\n", __func__, remove ? "" : "NOT ");
-
-        if (remove) {
-            std::string strDataAsPlainString = "nullptr";
-            if (pObj) {
-                strDataAsPlainString = pObj->GetDataAsPlainString();
-                // mark corresponding object for deletion
-                pObj->PrepareDeletion(GetTime<std::chrono::seconds>().count());
-            }
-            LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- Removing trigger object %s\n", __func__,
-                     strDataAsPlainString);
-            // delete the trigger
-            mapTrigger.erase(it++);
-        } else {
-            ++it;
-        }
-    }
-}
-
-/**
- *   Get Active Triggers
- *
- *   - Look through triggers and scan for active ones
- *   - Return the triggers in a list
- */
-std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggers() const
-{
-    AssertLockNotHeld(cs_store);
-    LOCK(cs_store);
-    return GetActiveTriggersInternal();
-}
-
-std::vector<CSuperblock_sptr> CGovernanceManager::GetActiveTriggersInternal() const
-{
-    AssertLockHeld(cs_store);
-    std::vector<CSuperblock_sptr> vecResults;
-
-    // LOOK AT THESE OBJECTS AND COMPILE A VALID LIST OF TRIGGERS
-    for (const auto& [nHash, pSuperblock] : mapTrigger) {
-        auto pObj = FindConstGovernanceObjectInternal(nHash);
-        if (pObj) {
-            vecResults.push_back(pSuperblock);
-        }
-    }
-
-    return vecResults;
-}
-
-bool CGovernanceManager::IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-{
-    AssertLockNotHeld(cs_store);
-    LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- Start nBlockHeight = %d\n", nBlockHeight);
-    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
-        return false;
-    }
-
-    LOCK(cs_store);
-    // GET ALL ACTIVE TRIGGERS
-    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
-
-    LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- vecTriggers.size() = %d\n", vecTriggers.size());
-
-    for (const auto& pSuperblock : vecTriggers) {
-        if (!pSuperblock) {
-            LogPrintf("IsSuperblockTriggered -- Non-superblock found, continuing\n");
-            continue;
-        }
-
-        auto pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
-        if (!pObj) {
-            LogPrintf("IsSuperblockTriggered -- pObj == nullptr, continuing\n");
-            continue;
-        }
-
-        LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- data = %s\n", pObj->GetDataAsPlainString());
-
-        // note : 12.1 - is epoch calculation correct?
-
-        if (nBlockHeight != pSuperblock->GetBlockHeight()) {
-            LogPrint(BCLog::GOBJECT, /* Continued */
-                     "IsSuperblockTriggered -- block height doesn't match nBlockHeight = %d, blockStart = %d, "
-                     "continuing\n",
-                     nBlockHeight, pSuperblock->GetBlockHeight());
-            continue;
-        }
-
-        // MAKE SURE THIS TRIGGER IS ACTIVE VIA FUNDING CACHE FLAG
-
-        pObj->UpdateSentinelVariables(tip_mn_list);
-
-        if (pObj->IsSetCachedFunding()) {
-            LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- fCacheFunding = true, returning true\n");
-            return true;
-        } else {
-            LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- fCacheFunding = false, continuing\n");
-        }
-    }
-
-    return false;
-}
-
-bool CGovernanceManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                           int nBlockHeight)
-{
-    AssertLockNotHeld(cs_store);
-    LOCK(cs_store);
-    return GetBestSuperblockInternal(tip_mn_list, pSuperblockRet, nBlockHeight);
-}
-
-bool CGovernanceManager::GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list,
-                                                   CSuperblock_sptr& pSuperblockRet, int nBlockHeight)
-{
-    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
-        return false;
-    }
-
-    AssertLockHeld(cs_store);
-    std::vector<CSuperblock_sptr> vecTriggers = GetActiveTriggersInternal();
-    int nYesCount = 0;
-
-    for (const auto& pSuperblock : vecTriggers) {
-        if (!pSuperblock || nBlockHeight != pSuperblock->GetBlockHeight()) {
-            continue;
-        }
-
-        auto pObj = FindGovernanceObjectInternal(pSuperblock->GetGovernanceObjHash());
-        if (!pObj) {
-            continue;
-        }
-
-        // DO WE HAVE A NEW WINNER?
-
-        int nTempYesCount = pObj->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
-        if (nTempYesCount > nYesCount) {
-            nYesCount = nTempYesCount;
-            pSuperblockRet = pSuperblock;
-        }
-    }
-
-    return nYesCount > 0;
-}
-
-bool CGovernanceManager::GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
-                                               std::vector<CTxOut>& voutSuperblockRet)
-{
-    LOCK(cs_store);
-
-    // GET THE BEST SUPERBLOCK FOR THIS BLOCK HEIGHT
-
-    CSuperblock_sptr pSuperblock;
-    if (!GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
-        LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
-        return false;
-    }
-
-    // make sure it's empty, just in case
-    voutSuperblockRet.clear();
-
-    // GET SUPERBLOCK OUTPUTS
-
-    // Superblock payments will be appended to the end of the coinbase vout vector
-
-    // TODO: How many payments can we add before things blow up?
-    //       Consider at least following limits:
-    //          - max coinbase tx size
-    //          - max "budget" available
-    for (int i = 0; i < pSuperblock->CountPayments(); i++) {
-        CGovernancePayment payment;
-        if (pSuperblock->GetPayment(i, payment)) {
-            // SET COINBASE OUTPUT TO SUPERBLOCK SETTING
-
-            CTxOut txout = CTxOut(payment.nAmount, payment.script);
-            voutSuperblockRet.push_back(txout);
-
-            // PRINT NICE LOG OUTPUT FOR SUPERBLOCK PAYMENT
-
-            CTxDestination dest;
-            ExtractDestination(payment.script, dest);
-
-            LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- NEW Superblock: output %d (addr %s, amount %d.%08d)\n",
-                     i, EncodeDestination(dest), payment.nAmount / COIN, payment.nAmount % COIN);
-        } else {
-            LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- Payment not found\n");
-        }
-    }
-
-    return true;
-}
-
-bool CGovernanceManager::IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
-                                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
-{
-    // GET BEST SUPERBLOCK, SHOULD MATCH
-    LOCK(cs_store);
-
-    CSuperblock_sptr pSuperblock;
-    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
-        return pSuperblock->IsValid(active_chain, txNew, nBlockHeight, blockReward);
-    }
-
-    return false;
-}
-
-void CGovernanceManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-{
-    AssertLockHeld(cs_store);
-
-    CSuperblock_sptr pSuperblock;
-    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
-        // All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
-        // tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
-        pSuperblock->SetExecuted();
-    }
-}
-
 std::vector<std::shared_ptr<const CGovernanceObject>> CGovernanceManager::GetApprovedProposals(
     const CDeterministicMNList& tip_mn_list)
 {
diff --git a/src/governance/governance.h b/src/governance/governance.h
index bce031abede0..07a3bc4f606e 100644
--- a/src/governance/governance.h
+++ b/src/governance/governance.h
@@ -7,9 +7,7 @@
 
 #include <cachemap.h>
 #include <cachemultimap.h>
-#include <governance/signing.h>
-
-#include <protocol.h>
+#include <primitives/transaction.h>
 #include <sync.h>
 
 #include <chrono>
@@ -18,33 +16,31 @@
 #include <memory>
 #include <set>
 #include <string>
-#include <string_view>
 #include <vector>
 
 class CBloomFilter;
 class CBlockIndex;
-class CChain;
 class CConnman;
+class CDataStream;
+class CDeterministicMNList;
+class CDeterministicMNManager;
 class ChainstateManager;
 template<typename T>
 class CFlatDB;
-class CInv;
-class CNode;
-struct RPCResult;
-
-class CDeterministicMNList;
-class CDeterministicMNManager;
 class CGovernanceException;
-class CGovernanceManager;
 class CGovernanceObject;
 class CGovernanceVote;
+class CInv;
 class CMasternodeMetaMan;
 class CMasternodeSync;
-class CSuperblock;
-
+class CService;
+struct RPCResult;
 class UniValue;
 
-using CSuperblock_sptr = std::shared_ptr<CSuperblock>;
+namespace governance {
+class SuperblockManager;
+} // namespace governance
+
 using vote_time_pair_t = std::pair<CGovernanceVote, int64_t>;
 
 static constexpr int RATE_BUFFER_SIZE = 5;
@@ -231,21 +227,20 @@ class GovernanceStore
 //
 // Governance Manager : Contains all proposals for the budget
 //
-class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
+class CGovernanceManager : public GovernanceStore
 {
-    friend class CGovernanceObject;
-
 private:
     using db_type = CFlatDB<GovernanceStore>;
     using object_ref_cm_t = CacheMap<uint256, std::shared_ptr<CGovernanceObject>>;
 
 private:
     const std::unique_ptr<db_type> m_db;
-    bool is_valid{false};
+    bool is_loaded{false};
 
     CMasternodeMetaMan& m_mn_metaman;
     const ChainstateManager& m_chainman;
-    const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
+    governance::SuperblockManager& m_superblocks;
+    CDeterministicMNManager& m_dmnman;
     CMasternodeSync& m_mn_sync;
 
     int64_t nTimeLastDiff{0};
@@ -256,7 +251,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     std::set<uint256> setAdditionalRelayObjects;
     std::map<uint256, std::chrono::seconds> m_requested_hash_time;
     bool fRateChecksEnabled{true};
-    std::map<uint256, std::shared_ptr<CSuperblock>> mapTrigger;
 
     mutable Mutex cs_relay;
     std::vector<CInv> m_relay_invs GUARDED_BY(cs_relay);
@@ -265,13 +259,13 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     CGovernanceManager() = delete;
     CGovernanceManager(const CGovernanceManager&) = delete;
     CGovernanceManager& operator=(const CGovernanceManager&) = delete;
-    explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
-                                const ChainstateManager& chainman,
-                                const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
+    explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman, const ChainstateManager& chainman,
+                                governance::SuperblockManager& superblocks, CDeterministicMNManager& dmnman,
+                                CMasternodeSync& mn_sync);
     ~CGovernanceManager();
 
     // Basic initialization and querying
-    bool IsValid() const override { return is_valid; }
+    bool IsValid() const { return is_loaded; }
     bool LoadCache(bool load_cache)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     [[nodiscard]] static RPCResult GetJsonHelp(const std::string& key, bool optional);
@@ -286,7 +280,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     bool AreRateChecksEnabled() const { return fRateChecksEnabled; }
 
     // Getters/Setters
-    int GetCachedBlockHeight() const override { return nCachedBlockHeight; }
+    int GetCachedBlockHeight() const { return nCachedBlockHeight; }
     int64_t GetLastDiffTime() const { return nTimeLastDiff; }
     std::vector<CGovernanceVote> GetCurrentVotes(const uint256& nParentHash, const COutPoint& mnCollateralOutpointFilter) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
@@ -303,7 +297,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
      */
     bool ConfirmInventoryRequest(const CInv& inv)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) override
+    bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
     void RelayObject(const CGovernanceObject& obj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_relay);
@@ -315,29 +309,16 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
 
     // Signer interface
-    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) override
+    bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    std::shared_ptr<CGovernanceObject> FindGovernanceObjectByDataHash(const uint256& nDataHash) override
+    std::shared_ptr<CGovernanceObject> FindGovernanceObjectByDataHash(const uint256& nDataHash)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list) override
+    std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(const CDeterministicMNList& tip_mn_list)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    void AddGovernanceObject(CGovernanceObject& govobj, const std::string& peer_str) override
+    void AddGovernanceObject(CGovernanceObject& govobj, const std::string& peer_str)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store, !cs_relay);
 
-    // Superblocks
-    bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
-                               std::vector<CTxOut>& voutSuperblockRet)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
-                           const CTransaction& txNew, int nBlockHeight, CAmount blockReward)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-
     // Thread-safe accessors
-    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                           int nBlockHeight) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool HaveObjectForHash(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool HaveVoteForHash(const uint256& nHash) const
@@ -346,12 +327,9 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     bool SerializeVoteForHash(const uint256& nHash, CDataStream& ss) const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    std::shared_ptr<CGovernanceObject> FindGovernanceObject(const uint256& nHash) override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
+    std::shared_ptr<CGovernanceObject> FindGovernanceObject(const uint256& nHash) EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     int GetVoteCount() const
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const override
-        EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
     void AddPostponedObject(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
@@ -389,13 +367,8 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     // Internal counterparts to "Thread-safe accessors"
     void AddPostponedObjectInternal(const CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& pSuperblockRet,
-                                   int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
     std::shared_ptr<CGovernanceObject> FindGovernanceObjectInternal(const uint256& nHash)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-    std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggersInternal() const
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
     std::shared_ptr<const CGovernanceObject> FindConstGovernanceObjectInternal(const uint256& nHash) const
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
@@ -417,28 +390,12 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
     void InitOnLoad()
         EXCLUSIVE_LOCKS_REQUIRED(!cs_store);
 
-    /*
-     * Trigger Management (formerly CGovernanceTriggerManager)
-     *   - Track governance objects which are triggers
-     *   - After triggers are activated and executed, they can be removed
-    */
-    bool AddNewTrigger(uint256 nHash)
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-    void CleanAndRemoveTriggers()
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-
-    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-
     void CheckOrphanVotes(CGovernanceObject& govobj)
         EXCLUSIVE_LOCKS_REQUIRED(cs_store, !cs_relay);
 
     void RebuildIndexes()
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 
-    void AddCachedTriggers()
-        EXCLUSIVE_LOCKS_REQUIRED(cs_store);
-
     void RemoveInvalidVotes()
         EXCLUSIVE_LOCKS_REQUIRED(cs_store);
 };
diff --git a/src/governance/net_governance.cpp b/src/governance/net_governance.cpp
index 852175d05b36..da164a0d06a5 100644
--- a/src/governance/net_governance.cpp
+++ b/src/governance/net_governance.cpp
@@ -8,6 +8,7 @@
 #include <common/bloom.h>
 #include <evo/deterministicmns.h>
 #include <governance/governance.h>
+#include <governance/object.h>
 #include <logging.h>
 #include <masternode/sync.h>
 #include <net.h>
@@ -198,3 +199,36 @@ void NetGovernance::ProcessMessage(CNode& peer, const std::string& msg_type, CDa
         }
     }
 }
+
+bool NetGovernance::AlreadyHave(const CInv& inv)
+{
+    if (inv.type != MSG_GOVERNANCE_OBJECT && inv.type != MSG_GOVERNANCE_OBJECT_VOTE) {
+        return false;
+    }
+    // When governance isn't loaded (e.g. -disablegovernance), claim we already have
+    // the item so we don't fetch or track it. ConfirmInventoryRequest would otherwise
+    // grow m_requested_hash_time unbounded since CheckAndRemove never runs in that mode.
+    if (!m_gov_manager.IsValid()) return true;
+    return !m_gov_manager.ConfirmInventoryRequest(inv);
+}
+
+bool NetGovernance::ProcessGetData(CNode& pfrom, const CInv& inv, CConnman& connman, const CNetMsgMaker& msgMaker)
+{
+    if (inv.type == MSG_GOVERNANCE_OBJECT) {
+        if (!m_gov_manager.HaveObjectForHash(inv.hash)) return false;
+        CDataStream ss(SER_NETWORK, pfrom.GetCommonVersion());
+        ss.reserve(1000);
+        if (!m_gov_manager.SerializeObjectForHash(inv.hash, ss)) return false;
+        connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCEOBJECT, ss));
+        return true;
+    }
+    if (inv.type == MSG_GOVERNANCE_OBJECT_VOTE) {
+        if (!m_gov_manager.HaveVoteForHash(inv.hash)) return false;
+        CDataStream ss(SER_NETWORK, pfrom.GetCommonVersion());
+        ss.reserve(1000);
+        if (!m_gov_manager.SerializeVoteForHash(inv.hash, ss)) return false;
+        connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCEOBJECTVOTE, ss));
+        return true;
+    }
+    return false;
+}
diff --git a/src/governance/net_governance.h b/src/governance/net_governance.h
index 6d226f5f8f53..5eaf4155b01a 100644
--- a/src/governance/net_governance.h
+++ b/src/governance/net_governance.h
@@ -27,6 +27,9 @@ class NetGovernance final : public NetHandler
 
     void ProcessMessage(CNode& peer, const std::string& msg_type, CDataStream& vRecv) override;
 
+    bool AlreadyHave(const CInv& inv) override;
+    bool ProcessGetData(CNode& pfrom, const CInv& inv, CConnman& connman, const CNetMsgMaker& msgMaker) override;
+
 private:
     CGovernanceManager& m_gov_manager;
     CMasternodeSync& m_node_sync;
diff --git a/src/governance/object.cpp b/src/governance/object.cpp
index 86431439196f..e348444b5096 100644
--- a/src/governance/object.cpp
+++ b/src/governance/object.cpp
@@ -6,23 +6,331 @@
 
 #include <bls/bls.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance.h>
-#include <governance/validators.h>
 #include <masternode/meta.h>
 #include <masternode/sync.h>
 
 #include <chainparams.h>
 #include <index/txindex.h>
+#include <key_io.h>
 #include <logging.h>
 #include <node/interface_ui.h>
 #include <timedata.h>
+#include <tinyformat.h>
+#include <util/std23.h>
 #include <util/strencodings.h>
 #include <util/time.h>
 #include <validation.h>
 #include <validationinterface.h>
 
+#include <univalue.h>
+
+#include <algorithm>
+#include <iostream>
 #include <string>
 
+namespace {
+
+constexpr size_t MAX_DATA_SIZE = 512;
+constexpr size_t MAX_NAME_SIZE = 40;
+
+bool GetDataValue(const UniValue& objJSON, const std::string& strKey, std::string& strValueRet, std::string& strErrorMessages)
+{
+    try {
+        strValueRet = objJSON[strKey].get_str();
+        return true;
+    } catch (std::exception& e) {
+        strErrorMessages += std::string(e.what()) + std::string(";");
+    } catch (...) {
+        strErrorMessages += "Unknown exception;";
+    }
+    return false;
+}
+
+bool GetDataValue(const UniValue& objJSON, const std::string& strKey, int64_t& nValueRet, std::string& strErrorMessages)
+{
+    try {
+        const UniValue& uValue = objJSON[strKey];
+        if (uValue.getType() == UniValue::VNUM) {
+            nValueRet = uValue.getInt<int64_t>();
+            return true;
+        }
+    } catch (std::exception& e) {
+        strErrorMessages += std::string(e.what()) + std::string(";");
+    } catch (...) {
+        strErrorMessages += "Unknown exception;";
+    }
+    return false;
+}
+
+bool GetDataValue(const UniValue& objJSON, const std::string& strKey, double& dValueRet, std::string& strErrorMessages)
+{
+    try {
+        const UniValue& uValue = objJSON[strKey];
+        if (uValue.getType() == UniValue::VNUM) {
+            dValueRet = uValue.get_real();
+            return true;
+        }
+    } catch (std::exception& e) {
+        strErrorMessages += std::string(e.what()) + std::string(";");
+    } catch (...) {
+        strErrorMessages += "Unknown exception;";
+    }
+    return false;
+}
+
+bool ValidateType(const UniValue& objJSON, std::string& strErrorMessages)
+{
+    int64_t nType;
+    if (!GetDataValue(objJSON, "type", nType, strErrorMessages)) {
+        strErrorMessages += "type field not found;";
+        return false;
+    }
+
+    if (nType != std23::to_underlying(GovernanceObject::PROPOSAL)) {
+        strErrorMessages += strprintf("type is not %d;", std23::to_underlying(GovernanceObject::PROPOSAL));
+        return false;
+    }
+
+    return true;
+}
+
+bool ValidateName(const UniValue& objJSON, std::string& strErrorMessages)
+{
+    std::string strName;
+    if (!GetDataValue(objJSON, "name", strName, strErrorMessages)) {
+        strErrorMessages += "name field not found;";
+        return false;
+    }
+
+    if (strName.size() > MAX_NAME_SIZE) {
+        strErrorMessages += strprintf("name exceeds %lu characters;", MAX_NAME_SIZE);
+        return false;
+    }
+
+    if (strName.empty()) {
+        strErrorMessages += "name cannot be empty;";
+        return false;
+    }
+
+    static constexpr std::string_view strAllowedChars{"-_abcdefghijklmnopqrstuvwxyz0123456789"};
+
+    strName = ToLower(strName);
+
+    if (strName.find_first_not_of(strAllowedChars) != std::string::npos) {
+        strErrorMessages += "name contains invalid characters;";
+        return false;
+    }
+
+    return true;
+}
+
+bool ValidateStartEndEpoch(const UniValue& objJSON, bool fCheckExpiration, std::string& strErrorMessages)
+{
+    int64_t nStartEpoch = 0;
+    int64_t nEndEpoch = 0;
+
+    if (!GetDataValue(objJSON, "start_epoch", nStartEpoch, strErrorMessages)) {
+        strErrorMessages += "start_epoch field not found;";
+        return false;
+    }
+
+    if (!GetDataValue(objJSON, "end_epoch", nEndEpoch, strErrorMessages)) {
+        strErrorMessages += "end_epoch field not found;";
+        return false;
+    }
+
+    if (nEndEpoch <= nStartEpoch) {
+        strErrorMessages += "end_epoch <= start_epoch;";
+        return false;
+    }
+
+    if (fCheckExpiration && nEndEpoch <= GetAdjustedTime()) {
+        strErrorMessages += "expired;";
+        return false;
+    }
+
+    return true;
+}
+
+bool ValidatePaymentAmount(const UniValue& objJSON, std::string& strErrorMessages)
+{
+    double dValue = 0.0;
+
+    if (!GetDataValue(objJSON, "payment_amount", dValue, strErrorMessages)) {
+        strErrorMessages += "payment_amount field not found;";
+        return false;
+    }
+
+    if (dValue <= 0.0) {
+        strErrorMessages += "payment_amount is negative;";
+        return false;
+    }
+
+    // TODO: Should check for an amount which exceeds the budget but this is
+    // currently difficult because start and end epochs are defined in terms of
+    // clock time instead of block height.
+
+    return true;
+}
+
+bool ValidatePaymentAddress(const UniValue& objJSON, bool fAllowScript, std::string& strErrorMessages)
+{
+    std::string strPaymentAddress;
+
+    if (!GetDataValue(objJSON, "payment_address", strPaymentAddress, strErrorMessages)) {
+        strErrorMessages += "payment_address field not found;";
+        return false;
+    }
+
+    if (std::find_if(strPaymentAddress.begin(), strPaymentAddress.end(), IsSpace) != strPaymentAddress.end()) {
+        strErrorMessages += "payment_address can't have whitespaces;";
+        return false;
+    }
+
+    CTxDestination dest = DecodeDestination(strPaymentAddress);
+    if (!IsValidDestination(dest)) {
+        strErrorMessages += "payment_address is invalid;";
+        return false;
+    }
+
+    const ScriptHash *scriptID = std::get_if<ScriptHash>(&dest);
+    if (!fAllowScript && scriptID) {
+        strErrorMessages += "script addresses are not supported;";
+        return false;
+    }
+
+    return true;
+}
+
+/*
+  The purpose of this function is to replicate the behavior of the
+  Python urlparse function used by sentinel (urlparse.py).  This function
+  should return false whenever urlparse raises an exception and true
+  otherwise.
+ */
+bool CheckURL(const std::string& strURLIn)
+{
+    std::string strRest(strURLIn);
+    std::string::size_type nPos = strRest.find(':');
+
+    if (nPos != std::string::npos) {
+        if (nPos < strRest.size()) {
+            strRest = strRest.substr(nPos + 1);
+        } else {
+            strRest = "";
+        }
+    }
+
+    // Process netloc
+    if ((strRest.size() > 2) && (strRest.substr(0, 2) == "//")) {
+        static constexpr std::string_view strNetlocDelimiters{"/?#"};
+
+        strRest = strRest.substr(2);
+
+        std::string::size_type nPos2 = strRest.find_first_of(strNetlocDelimiters);
+
+        std::string strNetloc = strRest.substr(0, nPos2);
+
+        if ((strNetloc.find('[') != std::string::npos) && (strNetloc.find(']') == std::string::npos)) {
+            return false;
+        }
+
+        if ((strNetloc.find(']') != std::string::npos) && (strNetloc.find('[') == std::string::npos)) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+bool ValidateURL(const UniValue& objJSON, std::string& strErrorMessages)
+{
+    std::string strURL;
+    if (!GetDataValue(objJSON, "url", strURL, strErrorMessages)) {
+        strErrorMessages += "url field not found;";
+        return false;
+    }
+
+    if (std::find_if(strURL.begin(), strURL.end(), IsSpace) != strURL.end()) {
+        strErrorMessages += "url can't have whitespaces;";
+        return false;
+    }
+
+    if (strURL.size() < 4U) {
+        strErrorMessages += "url too short;";
+        return false;
+    }
+
+    if (!CheckURL(strURL)) {
+        strErrorMessages += "url invalid;";
+        return false;
+    }
+
+    return true;
+}
+
+bool ParseProposalJSON(const std::string& strHexData, UniValue& objJSONOut, std::string& strErrorMessages)
+{
+    if (strHexData.empty()) return false;
+
+    std::vector<unsigned char> v = ParseHex(strHexData);
+    if (v.size() > MAX_DATA_SIZE) {
+        strErrorMessages = strprintf("data exceeds %lu characters;", MAX_DATA_SIZE);
+        return false;
+    }
+
+    const std::string strJSONData(v.begin(), v.end());
+    if (strJSONData.empty()) return false;
+
+    try {
+        UniValue obj(UniValue::VOBJ);
+        obj.read(strJSONData);
+        if (!obj.isObject()) {
+            throw std::runtime_error("Proposal must be a JSON object");
+        }
+        objJSONOut = obj;
+        return true;
+    } catch (std::exception& e) {
+        strErrorMessages += std::string(e.what()) + std::string(";");
+    } catch (...) {
+        strErrorMessages += "Unknown exception;";
+    }
+    return false;
+}
+
+} // namespace
+
+std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType)
+{
+    switch (eType) {
+    case GOVERNANCE_EXCEPTION_NONE:
+        os << "GOVERNANCE_EXCEPTION_NONE";
+        break;
+    case GOVERNANCE_EXCEPTION_WARNING:
+        os << "GOVERNANCE_EXCEPTION_WARNING";
+        break;
+    case GOVERNANCE_EXCEPTION_PERMANENT_ERROR:
+        os << "GOVERNANCE_EXCEPTION_PERMANENT_ERROR";
+        break;
+    case GOVERNANCE_EXCEPTION_TEMPORARY_ERROR:
+        os << "GOVERNANCE_EXCEPTION_TEMPORARY_ERROR";
+        break;
+    case GOVERNANCE_EXCEPTION_INTERNAL_ERROR:
+        os << "GOVERNANCE_EXCEPTION_INTERNAL_ERROR";
+        break;
+    }
+    return os;
+}
+
+CGovernanceException::CGovernanceException(const std::string& strMessageIn,
+                                           governance_exception_type_enum_t eTypeIn,
+                                           int nNodePenaltyIn) :
+    strMessage{strprintf("%s:%s", eTypeIn, strMessageIn)},
+    eType{eTypeIn},
+    nNodePenalty{nNodePenaltyIn}
+{
+}
+
 CGovernanceObject::CGovernanceObject()
 {
     // PARSE JSON DATA STORAGE (VCHDATA)
@@ -56,8 +364,9 @@ CGovernanceObject::CGovernanceObject(const CGovernanceObject& other) :
 {
 }
 
-bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceManager& govman, const CDeterministicMNList& tip_mn_list,
-                                    const CGovernanceVote& vote, CGovernanceException& exception)
+bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, bool fRateChecksEnabled,
+                                    const CDeterministicMNList& tip_mn_list, const CGovernanceVote& vote,
+                                    CGovernanceException& exception)
 {
     assert(mn_metaman.IsValid());
 
@@ -123,7 +432,7 @@ bool CGovernanceObject::ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceM
 
     int64_t nNow = GetAdjustedTime();
     int64_t nVoteTimeUpdate = voteInstanceRef.nTime;
-    if (govman.AreRateChecksEnabled()) {
+    if (fRateChecksEnabled) {
         int64_t nTimeDelta = nNow - voteInstanceRef.nTime;
         if (nTimeDelta < GOVERNANCE_UPDATE_MIN) {
             std::string msg{strprintf("CGovernanceObject::%s -- Masternode voting too often, MN outpoint = %s, "
@@ -393,12 +702,12 @@ bool CGovernanceObject::IsValidLocally(const CDeterministicMNList& tip_mn_list,
 
     switch (m_obj.type) {
     case GovernanceObject::PROPOSAL: {
-        CProposalValidator validator(GetDataAsHexString());
         // Note: It's ok to have expired proposals
         // they are going to be cleared by CGovernanceManager::CheckAndRemove()
         // TODO: should they be tagged as "expired" to skip vote downloading?
-        if (!validator.Validate(false)) {
-            strError = strprintf("Invalid proposal data, error messages: %s", validator.GetErrorMessages());
+        std::string strValidationError;
+        if (!governance::ValidateProposal(GetDataAsHexString(), strValidationError, /*fCheckExpiration=*/false)) {
+            strError = strprintf("Invalid proposal data, error messages: %s", strValidationError);
             return false;
         }
         if (fCheckCollateral && !IsCollateralValid(chainman, strError, fMissingConfirmations)) {
@@ -661,3 +970,40 @@ void CGovernanceObject::UpdateSentinelVariables(const CDeterministicMNList& tip_
 
     if (GetAbsoluteNoCount(tip_mn_list, VOTE_SIGNAL_VALID) >= nAbsVoteReq) fCachedValid = false;
 }
+
+namespace governance {
+bool ValidateProposal(const std::string& strDataHex, std::string& strErrorOut,
+                      bool fCheckExpiration, bool fAllowScript)
+{
+    UniValue objJSON(UniValue::VOBJ);
+    if (!ParseProposalJSON(strDataHex, objJSON, strErrorOut)) {
+        strErrorOut += "JSON parsing error;";
+        return false;
+    }
+    if (!ValidateType(objJSON, strErrorOut)) {
+        strErrorOut += "Invalid type;";
+        return false;
+    }
+    if (!ValidateName(objJSON, strErrorOut)) {
+        strErrorOut += "Invalid name;";
+        return false;
+    }
+    if (!ValidateStartEndEpoch(objJSON, fCheckExpiration, strErrorOut)) {
+        strErrorOut += "Invalid start:end range;";
+        return false;
+    }
+    if (!ValidatePaymentAmount(objJSON, strErrorOut)) {
+        strErrorOut += "Invalid payment amount;";
+        return false;
+    }
+    if (!ValidatePaymentAddress(objJSON, fAllowScript, strErrorOut)) {
+        strErrorOut += "Invalid payment address;";
+        return false;
+    }
+    if (!ValidateURL(objJSON, strErrorOut)) {
+        strErrorOut += "Invalid URL;";
+        return false;
+    }
+    return true;
+}
+} // namespace governance
diff --git a/src/governance/object.h b/src/governance/object.h
index 2f2443915835..38b88185d6f8 100644
--- a/src/governance/object.h
+++ b/src/governance/object.h
@@ -6,26 +6,83 @@
 #define BITCOIN_GOVERNANCE_OBJECT_H
 
 #include <governance/common.h>
-#include <governance/exceptions.h>
 #include <governance/vote.h>
 #include <governance/votedb.h>
 #include <sync.h>
 
 #include <span.h>
 
-#include <univalue.h>
+#include <exception>
+#include <iosfwd>
+#include <string>
 
 class CBLSPublicKey;
 class CDeterministicMNList;
-class CGovernanceManager;
-class CGovernanceObject;
-class CGovernanceVote;
 class ChainstateManager;
 class CMasternodeMetaMan;
 struct RPCResult;
 
 extern RecursiveMutex cs_main; // NOLINT(readability-redundant-declaration)
 
+enum governance_exception_type_enum_t {
+    /// Default value, normally indicates no exception condition occurred
+    GOVERNANCE_EXCEPTION_NONE = 0,
+    /// Unusual condition requiring no caller action
+    GOVERNANCE_EXCEPTION_WARNING = 1,
+    /// Requested operation cannot be performed
+    GOVERNANCE_EXCEPTION_PERMANENT_ERROR = 2,
+    /// Requested operation not currently possible, may resubmit later
+    GOVERNANCE_EXCEPTION_TEMPORARY_ERROR = 3,
+    /// Unexpected error (ie. should not happen unless there is a bug in the code)
+    GOVERNANCE_EXCEPTION_INTERNAL_ERROR = 4
+};
+
+std::ostream& operator<<(std::ostream& os, governance_exception_type_enum_t eType);
+
+/**
+ * A class which encapsulates information about a governance exception condition
+ *
+ * Derives from std::exception so is suitable for throwing
+ * (ie. will be caught by a std::exception handler) but may also be used as a
+ * normal object.
+ */
+class CGovernanceException : public std::exception
+{
+private:
+    std::string strMessage;
+
+    governance_exception_type_enum_t eType;
+
+    int nNodePenalty;
+
+public:
+    explicit CGovernanceException(const std::string& strMessageIn = "",
+        governance_exception_type_enum_t eTypeIn = GOVERNANCE_EXCEPTION_NONE,
+        int nNodePenaltyIn = 0);
+
+    ~CGovernanceException() noexcept override = default;
+
+    const char* what() const noexcept override
+    {
+        return strMessage.c_str();
+    }
+
+    const std::string& GetMessage() const
+    {
+        return strMessage;
+    }
+
+    governance_exception_type_enum_t GetType() const
+    {
+        return eType;
+    }
+
+    int GetNodePenalty() const
+    {
+        return nNodePenalty;
+    }
+};
+
 static constexpr double GOVERNANCE_FILTER_FP_RATE = 0.001;
 static constexpr CAmount GOVERNANCE_PROPOSAL_FEE_TX = (1 * COIN);
 static constexpr int64_t GOVERNANCE_FEE_CONFIRMATIONS = 6;
@@ -284,9 +341,8 @@ class CGovernanceObject
     void LoadData();
     void GetData(UniValue& objResult) const;
 
-    bool ProcessVote(CMasternodeMetaMan& mn_metaman, CGovernanceManager& govman, const CDeterministicMNList& tip_mn_list,
-                     const CGovernanceVote& vote, CGovernanceException& exception)
-        EXCLUSIVE_LOCKS_REQUIRED(!cs);
+    bool ProcessVote(CMasternodeMetaMan& mn_metaman, bool fRateChecksEnabled, const CDeterministicMNList& tip_mn_list,
+                     const CGovernanceVote& vote, CGovernanceException& exception) EXCLUSIVE_LOCKS_REQUIRED(!cs);
 
     /// Called when MN's which have voted on this object have been removed
     void ClearMasternodeVotes(const CDeterministicMNList& tip_mn_list)
@@ -300,4 +356,14 @@ class CGovernanceObject
         EXCLUSIVE_LOCKS_REQUIRED(!cs);
 };
 
+namespace governance {
+/**
+ * Validate the serialized proposal data (hex-encoded JSON).
+ * Returns true on success. On failure, returns false and fills strErrorOut
+ * with a semicolon-delimited list of detected issues.
+ */
+bool ValidateProposal(const std::string& strDataHex, std::string& strErrorOut,
+                      bool fCheckExpiration = true, bool fAllowScript = true);
+} // namespace governance
+
 #endif // BITCOIN_GOVERNANCE_OBJECT_H
diff --git a/src/governance/signing.cpp b/src/governance/signing.cpp
index 173860b1aa19..3a3968bec224 100644
--- a/src/governance/signing.cpp
+++ b/src/governance/signing.cpp
@@ -6,7 +6,8 @@
 
 #include <active/masternode.h>
 #include <evo/deterministicmns.h>
-#include <governance/classes.h>
+#include <governance/governance.h>
+#include <governance/superblock.h>
 #include <masternode/sync.h>
 
 #include <chainparams.h>
@@ -22,12 +23,13 @@ namespace {
 constexpr std::chrono::seconds GOVERNANCE_FUDGE_WINDOW{2h};
 } // anonymous namespace
 
-GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
-                                   const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
-                                   const CMasternodeSync& mn_sync) :
+GovernanceSigner::GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                                   governance::SuperblockManager& superblocks, const CActiveMasternodeManager& mn_activeman,
+                                   const ChainstateManager& chainman, const CMasternodeSync& mn_sync) :
     m_connman{connman},
     m_dmnman{dmnman},
     m_govman{govman},
+    m_superblocks{superblocks},
     m_mn_activeman{mn_activeman},
     m_chainman{chainman},
     m_mn_sync{mn_sync}
@@ -213,7 +215,7 @@ void GovernanceSigner::VoteGovernanceTriggers(const std::optional<const CGoverna
     }
 
     // Vote NO-FUNDING for the rest of the active triggers
-    const auto activeTriggers = m_govman.GetActiveTriggers();
+    const auto activeTriggers = m_superblocks.GetActiveTriggers();
     for (const auto& trigger : activeTriggers) {
         auto govobj = m_govman.FindGovernanceObject(trigger->GetGovernanceObjHash());
         if (!govobj) {
@@ -291,7 +293,7 @@ void GovernanceSigner::UpdatedBlockTip(const CBlockIndex* pindex)
     const auto trigger_opt = CreateGovernanceTrigger(sb_opt);
     VoteGovernanceTriggers(trigger_opt);
     CSuperblock_sptr pSuperblock;
-    if (m_govman.GetBestSuperblock(m_dmnman.GetListAtChainTip(), pSuperblock, pindex->nHeight)) {
+    if (m_superblocks.GetBestSuperblock(m_dmnman.GetListAtChainTip(), pSuperblock, pindex->nHeight)) {
         ResetVotedFundingTrigger();
     }
 }
diff --git a/src/governance/signing.h b/src/governance/signing.h
index 6f4d3884bd09..8ad61a751b5e 100644
--- a/src/governance/signing.h
+++ b/src/governance/signing.h
@@ -5,8 +5,8 @@
 #ifndef BITCOIN_GOVERNANCE_SIGNING_H
 #define BITCOIN_GOVERNANCE_SIGNING_H
 
-#include <governance/classes.h>
 #include <governance/object.h>
+#include <governance/superblock.h>
 
 #include <uint256.h>
 
@@ -17,39 +17,22 @@
 class CActiveMasternodeManager;
 class CBlockIndex;
 class CConnman;
-class CDeterministicMNList;
 class CDeterministicMNManager;
-class CGovernanceException;
-class CGovernanceVote;
+class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
-enum vote_outcome_enum_t : int;
 
-class GovernanceSignerParent
-{
-public:
-    virtual ~GovernanceSignerParent() = default;
-
-    virtual bool IsValid() const = 0;
-    virtual bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list,
-                                   std::shared_ptr<CSuperblock>& pSuperblockRet, int nBlockHeight) = 0;
-    virtual bool MasternodeRateCheck(const CGovernanceObject& govobj, bool fUpdateFailStatus = false) = 0;
-    virtual bool ProcessVoteAndRelay(const CGovernanceVote& vote, CGovernanceException& exception, CConnman& connman) = 0;
-    virtual int GetCachedBlockHeight() const = 0;
-    virtual std::shared_ptr<CGovernanceObject> FindGovernanceObject(const uint256& nHash) = 0;
-    virtual std::shared_ptr<CGovernanceObject> FindGovernanceObjectByDataHash(const uint256& nDataHash) = 0;
-    virtual std::vector<std::shared_ptr<CSuperblock>> GetActiveTriggers() const = 0;
-    virtual std::vector<std::shared_ptr<const CGovernanceObject>> GetApprovedProposals(
-        const CDeterministicMNList& tip_mn_list) = 0;
-    virtual void AddGovernanceObject(CGovernanceObject& govobj, const std::string& peer_str) = 0;
-};
+namespace governance {
+class SuperblockManager;
+}
 
 class GovernanceSigner
 {
 private:
     CConnman& m_connman;
     CDeterministicMNManager& m_dmnman;
-    GovernanceSignerParent& m_govman;
+    CGovernanceManager& m_govman;
+    governance::SuperblockManager& m_superblocks;
     const CActiveMasternodeManager& m_mn_activeman;
     const ChainstateManager& m_chainman;
     const CMasternodeSync& m_mn_sync;
@@ -61,9 +44,9 @@ class GovernanceSigner
     GovernanceSigner() = delete;
     GovernanceSigner(const GovernanceSigner&) = delete;
     GovernanceSigner& operator=(const GovernanceSigner&) = delete;
-    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, GovernanceSignerParent& govman,
-                              const CActiveMasternodeManager& mn_activeman, const ChainstateManager& chainman,
-                              const CMasternodeSync& mn_sync);
+    explicit GovernanceSigner(CConnman& connman, CDeterministicMNManager& dmnman, CGovernanceManager& govman,
+                              governance::SuperblockManager& superblocks, const CActiveMasternodeManager& mn_activeman,
+                              const ChainstateManager& chainman, const CMasternodeSync& mn_sync);
     ~GovernanceSigner();
 
     void UpdatedBlockTip(const CBlockIndex* pindex);
diff --git a/src/governance/classes.cpp b/src/governance/superblock.cpp
similarity index 64%
rename from src/governance/classes.cpp
rename to src/governance/superblock.cpp
index e7ad845aaff6..f50538877257 100644
--- a/src/governance/classes.cpp
+++ b/src/governance/superblock.cpp
@@ -2,16 +2,19 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/classes.h>
-
-#include <util/std23.h>
+#include <governance/superblock.h>
 
 #include <chainparams.h>
 #include <core_io.h>
+#include <evo/deterministicmns.h>
+#include <governance/object.h>
+#include <governance/vote.h>
 #include <key_io.h>
+#include <logging.h>
 #include <primitives/transaction.h>
-#include <script/standard.h>
+#include <util/std23.h>
 #include <util/strencodings.h>
+#include <util/time.h>
 #include <validation.h>
 
 #include <univalue.h>
@@ -376,7 +379,7 @@ std::vector<uint256> CSuperblock::GetProposalHashes() const
 
 std::string CSuperblock::GetHexStrData() const
 {
-    // {\"event_block_height\": 879720, \"payment_addresses\": \"yd5KMREs3GLMe6mTJYr3YrH1juwNwrFCfB\", \"payment_amounts\": \"5.00000000\", \"proposal_hashes\": \"485817fddbcab6c55c9a6856dabc8b19ed79548bda8c01712daebc9f74f287f4\", \"type\": 2}\u0000
+    // {\"event_block_height\": 879720, \"payment_addresses\": \"yd5KMREs3GLMe6mTJYr3YrH1juwNwrFCfB\", \"payment_amounts\": \"5.00000000\", \"proposal_hashes\": \"485817fddbcab6c55c9a6856dabc8b19ed79548bda8c01712daebc9f74f287f4\", \"type\": 2}
 
     std::string str_addresses = Join(vecPayments, "|", [&](const auto& payment) {
         CTxDestination dest;
@@ -419,3 +422,249 @@ CGovernancePayment::CGovernancePayment(const CTxDestination& destIn, CAmount nAm
     }
 }
 
+namespace governance {
+
+bool SuperblockManager::AddTrigger(std::shared_ptr<CGovernanceObject> obj, int cachedHeight)
+{
+    AssertLockNotHeld(cs_sb);
+    if (!obj) return false;
+
+    uint256 nHash = obj->GetHash();
+
+    LOCK(cs_sb);
+    if (m_triggers.count(nHash)) {
+        LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- Already have hash, nHash = %s, size = %s\n", __func__,
+                 nHash.GetHex(), m_triggers.size());
+        return false;
+    }
+
+    CSuperblock_sptr pSuperblock;
+    try {
+        pSuperblock = std::make_shared<CSuperblock>(*obj, nHash);
+    } catch (std::exception& e) {
+        LogPrintf("SuperblockManager::%s -- Error creating superblock: %s\n", __func__, e.what());
+        return false;
+    } catch (...) {
+        LogPrintf("SuperblockManager::%s -- Unknown Error creating superblock\n", __func__);
+        return false;
+    }
+
+    pSuperblock->SetStatus(SeenObjectStatus::Valid);
+    m_triggers.emplace(nHash, TriggerEntry{pSuperblock, std::move(obj)});
+
+    return !pSuperblock->IsExpired(cachedHeight);
+}
+
+void SuperblockManager::RemoveTrigger(const uint256& hash)
+{
+    LOCK(cs_sb);
+    m_triggers.erase(hash);
+}
+
+void SuperblockManager::Clean(int cachedHeight)
+{
+    AssertLockNotHeld(cs_sb);
+    LOCK(cs_sb);
+
+    LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- m_triggers.size() = %d\n", __func__, m_triggers.size());
+
+    for (auto it = m_triggers.begin(); it != m_triggers.end();) {
+        bool remove = false;
+        const auto& [sb, obj] = it->second;
+
+        if (!sb) {
+            LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- nullptr superblock\n", __func__);
+            remove = true;
+        } else {
+            if (!obj || obj->GetObjectType() != GovernanceObject::TRIGGER) {
+                LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- Unknown or non-trigger superblock\n", __func__);
+                sb->SetStatus(SeenObjectStatus::ErrorInvalid);
+            }
+            LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- superblock status = %d\n", __func__,
+                     std23::to_underlying(sb->GetStatus()));
+            switch (sb->GetStatus()) {
+            case SeenObjectStatus::ErrorInvalid:
+            case SeenObjectStatus::Unknown:
+                LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- Unknown or invalid trigger found\n", __func__);
+                remove = true;
+                break;
+            case SeenObjectStatus::Valid:
+            case SeenObjectStatus::Executed:
+                LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- Valid trigger found\n", __func__);
+                if (sb->IsExpired(cachedHeight)) {
+                    if (obj) obj->SetExpired();
+                    remove = true;
+                }
+                break;
+            default:
+                break;
+            }
+        }
+        LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- %smarked for removal\n", __func__, remove ? "" : "NOT ");
+
+        if (remove) {
+            std::string strDataAsPlainString = "nullptr";
+            if (obj) {
+                strDataAsPlainString = obj->GetDataAsPlainString();
+                obj->PrepareDeletion(GetTime<std::chrono::seconds>().count());
+            }
+            LogPrint(BCLog::GOBJECT, "SuperblockManager::%s -- Removing trigger object %s\n", __func__,
+                     strDataAsPlainString);
+            it = m_triggers.erase(it);
+        } else {
+            ++it;
+        }
+    }
+}
+
+void SuperblockManager::Clear()
+{
+    LOCK(cs_sb);
+    m_triggers.clear();
+    m_loaded = false;
+}
+
+std::vector<CSuperblock_sptr> SuperblockManager::GetActiveTriggers() const
+{
+    LOCK(cs_sb);
+    std::vector<CSuperblock_sptr> vecResults;
+    vecResults.reserve(m_triggers.size());
+    for (const auto& [_, entry] : m_triggers) {
+        if (entry.sb && entry.obj) {
+            vecResults.push_back(entry.sb);
+        }
+    }
+    return vecResults;
+}
+
+bool SuperblockManager::GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& sbRet,
+                                          int nBlockHeight) const
+{
+    LOCK(cs_sb);
+    return GetBestSuperblockInternal(tip_mn_list, sbRet, nBlockHeight);
+}
+
+bool SuperblockManager::GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& sbRet,
+                                                  int nBlockHeight) const
+{
+    AssertLockHeld(cs_sb);
+    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
+        return false;
+    }
+
+    int nYesCount = 0;
+    for (const auto& [_, entry] : m_triggers) {
+        if (!entry.sb || !entry.obj || nBlockHeight != entry.sb->GetBlockHeight()) {
+            continue;
+        }
+        int nTempYesCount = entry.obj->GetAbsoluteYesCount(tip_mn_list, VOTE_SIGNAL_FUNDING);
+        if (nTempYesCount > nYesCount) {
+            nYesCount = nTempYesCount;
+            sbRet = entry.sb;
+        }
+    }
+    return nYesCount > 0;
+}
+
+bool SuperblockManager::IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
+{
+    LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- Start nBlockHeight = %d\n", nBlockHeight);
+    if (!CSuperblock::IsValidBlockHeight(nBlockHeight)) {
+        return false;
+    }
+
+    LOCK(cs_sb);
+
+    LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- m_triggers.size() = %d\n", m_triggers.size());
+
+    for (const auto& [_, entry] : m_triggers) {
+        if (!entry.sb) {
+            LogPrintf("IsSuperblockTriggered -- Non-superblock found, continuing\n");
+            continue;
+        }
+        if (!entry.obj) {
+            LogPrintf("IsSuperblockTriggered -- pObj == nullptr, continuing\n");
+            continue;
+        }
+
+        LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- data = %s\n", entry.obj->GetDataAsPlainString());
+
+        if (nBlockHeight != entry.sb->GetBlockHeight()) {
+            LogPrint(BCLog::GOBJECT, /* Continued */
+                     "IsSuperblockTriggered -- block height doesn't match nBlockHeight = %d, blockStart = %d, "
+                     "continuing\n",
+                     nBlockHeight, entry.sb->GetBlockHeight());
+            continue;
+        }
+
+        entry.obj->UpdateSentinelVariables(tip_mn_list);
+
+        if (entry.obj->IsSetCachedFunding()) {
+            LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- fCacheFunding = true, returning true\n");
+            return true;
+        } else {
+            LogPrint(BCLog::GOBJECT, "IsSuperblockTriggered -- fCacheFunding = false, continuing\n");
+        }
+    }
+
+    return false;
+}
+
+bool SuperblockManager::IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list,
+                                          const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const
+{
+    LOCK(cs_sb);
+    CSuperblock_sptr pSuperblock;
+    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
+        return pSuperblock->IsValid(active_chain, txNew, nBlockHeight, blockReward);
+    }
+    return false;
+}
+
+bool SuperblockManager::GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
+                                              std::vector<CTxOut>& voutSuperblockRet) const
+{
+    LOCK(cs_sb);
+
+    CSuperblock_sptr pSuperblock;
+    if (!GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
+        LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- Can't find superblock for height %d\n", nBlockHeight);
+        return false;
+    }
+
+    voutSuperblockRet.clear();
+
+    // TODO: How many payments can we add before things blow up?
+    //       Consider at least following limits:
+    //          - max coinbase tx size
+    //          - max "budget" available
+    for (int i = 0; i < pSuperblock->CountPayments(); i++) {
+        CGovernancePayment payment;
+        if (pSuperblock->GetPayment(i, payment)) {
+            voutSuperblockRet.emplace_back(payment.nAmount, payment.script);
+
+            CTxDestination dest;
+            ExtractDestination(payment.script, dest);
+
+            LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- NEW Superblock: output %d (addr %s, amount %d.%08d)\n",
+                     i, EncodeDestination(dest), payment.nAmount / COIN, payment.nAmount % COIN);
+        } else {
+            LogPrint(BCLog::GOBJECT, "GetSuperblockPayments -- Payment not found\n");
+        }
+    }
+
+    return true;
+}
+
+void SuperblockManager::ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight)
+{
+    LOCK(cs_sb);
+    CSuperblock_sptr pSuperblock;
+    if (GetBestSuperblockInternal(tip_mn_list, pSuperblock, nBlockHeight)) {
+        // All checks are done in CSuperblock::IsValid via IsBlockValueValid and IsBlockPayeeValid,
+        // tip wouldn't be updated if anything was wrong. Mark this trigger as executed.
+        pSuperblock->SetExecuted();
+    }
+}
+
+} // namespace governance
diff --git a/src/governance/superblock.h b/src/governance/superblock.h
new file mode 100644
index 000000000000..1b24bec323d2
--- /dev/null
+++ b/src/governance/superblock.h
@@ -0,0 +1,184 @@
+// Copyright (c) 2014-2025 The Dash Core developers
+// Distributed under the MIT/X11 software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_GOVERNANCE_SUPERBLOCK_H
+#define BITCOIN_GOVERNANCE_SUPERBLOCK_H
+
+#include <consensus/amount.h>
+#include <governance/object.h>
+#include <script/script.h>
+#include <script/standard.h>
+#include <sync.h>
+#include <uint256.h>
+
+#include <atomic>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
+class CChain;
+class CDeterministicMNList;
+class CTransaction;
+class CTxOut;
+
+CAmount ParsePaymentAmount(const std::string& strAmount);
+
+/**
+ * Governance Object Payment
+ */
+class CGovernancePayment
+{
+private:
+    bool fValid;
+
+public:
+    CScript script;
+    CAmount nAmount;
+    uint256 proposalHash;
+
+    CGovernancePayment() :
+        fValid(false),
+        script(),
+        nAmount(0),
+        proposalHash(0)
+    {
+    }
+
+    CGovernancePayment(const CTxDestination& destIn, CAmount nAmountIn, const uint256& proposalHash);
+
+    bool IsValid() const { return fValid; }
+};
+
+
+/**
+*  Trigger : Superblock
+*
+*   - Create payments on the network
+*
+*   object structure:
+*   {
+*       "governance_object_id" : last_id,
+*       "type" : govtypes.trigger,
+*       "subtype" : "superblock",
+*       "superblock_name" : superblock_name,
+*       "start_epoch" : start_epoch,
+*       "payment_addresses" : "addr1|addr2|addr3",
+*       "payment_amounts"   : "amount1|amount2|amount3"
+*   }
+*/
+class CSuperblock : public CGovernanceObject
+{
+private:
+    uint256 nGovObjHash;
+
+    int nBlockHeight;
+    SeenObjectStatus nStatus;
+    std::vector<CGovernancePayment> vecPayments;
+
+    void ParsePaymentSchedule(const std::string& strPaymentAddresses, const std::string& strPaymentAmounts, const std::string& strProposalHashes);
+
+public:
+    CSuperblock();
+    CSuperblock(int nBlockHeight, std::vector<CGovernancePayment> vecPayments);
+    explicit CSuperblock(const CGovernanceObject& obj, uint256& nHash);
+
+    static bool IsValidBlockHeight(int nBlockHeight);
+    static void GetNearestSuperblocksHeights(int nBlockHeight, int& nLastSuperblockRet, int& nNextSuperblockRet);
+    static CAmount GetPaymentsLimit(const CChain& active_chain, int nBlockHeight);
+
+    SeenObjectStatus GetStatus() const { return nStatus; }
+    void SetStatus(SeenObjectStatus nStatusIn) { nStatus = nStatusIn; }
+
+    std::string GetHexStrData() const;
+
+    // TELL THE ENGINE WE EXECUTED THIS EVENT
+    void SetExecuted() { nStatus = SeenObjectStatus::Executed; }
+
+    int GetBlockHeight() const
+    {
+        return nBlockHeight;
+    }
+
+    uint256 GetGovernanceObjHash() const { return nGovObjHash; }
+
+    int CountPayments() const { return (int)vecPayments.size(); }
+    bool GetPayment(int nPaymentIndex, CGovernancePayment& paymentRet);
+    CAmount GetPaymentsTotalAmount();
+
+    bool IsValid(const CChain& active_chain, const CTransaction& txNew, int nBlockHeight, CAmount blockReward);
+    bool IsExpired(int heightToTest) const;
+
+    std::vector<uint256> GetProposalHashes() const;
+};
+
+using CSuperblock_sptr = std::shared_ptr<CSuperblock>;
+
+namespace governance {
+
+/**
+ * Owns the set of active superblock triggers. Trigger lifecycle is fully
+ * owned here; CGovernanceManager pushes new TRIGGER objects in via
+ * AddTrigger() and notifies us via RemoveTrigger() when it erases the
+ * underlying object from its store. Each entry holds a strong reference
+ * to the underlying CGovernanceObject so we never look it up by hash.
+ *
+ * Lifetime: typically owned by CChainstateHelper, which outlives the
+ * paired CGovernanceManager. The govman drives m_loaded via SetLoaded()
+ * from LoadCache() and Clear()s us in its destructor, so IsValid() and
+ * the trigger map track the live govman's state.
+ */
+class SuperblockManager
+{
+public:
+    bool IsValid() const { return m_loaded; }
+    void SetLoaded(bool loaded) { m_loaded = loaded; }
+
+    /** Register a TRIGGER governance object. Returns true if the resulting
+     *  trigger is live (not already height-expired). */
+    bool AddTrigger(std::shared_ptr<CGovernanceObject> obj, int cachedHeight) EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    /** Single-direction notification from CGovernanceManager when it erases
+     *  a TRIGGER object from its store. */
+    void RemoveTrigger(const uint256& hash) EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    /** Prune triggers that are invalid or height-expired. Calls
+     *  PrepareDeletion() on the underlying object so CGovernanceManager
+     *  picks it up on its own sweep. */
+    void Clean(int cachedHeight) EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    void Clear() EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    std::vector<CSuperblock_sptr> GetActiveTriggers() const EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    bool GetBestSuperblock(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& sbRet, int nBlockHeight) const
+        EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    bool IsSuperblockTriggered(const CDeterministicMNList& tip_mn_list, int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    bool IsValidSuperblock(const CChain& active_chain, const CDeterministicMNList& tip_mn_list, const CTransaction& txNew,
+                           int nBlockHeight, CAmount blockReward) const EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    bool GetSuperblockPayments(const CDeterministicMNList& tip_mn_list, int nBlockHeight,
+                               std::vector<CTxOut>& voutSuperblockRet) const EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+    void ExecuteBestSuperblock(const CDeterministicMNList& tip_mn_list, int nBlockHeight) EXCLUSIVE_LOCKS_REQUIRED(!cs_sb);
+
+private:
+    struct TriggerEntry {
+        CSuperblock_sptr sb;
+        std::shared_ptr<CGovernanceObject> obj;
+    };
+
+    bool GetBestSuperblockInternal(const CDeterministicMNList& tip_mn_list, CSuperblock_sptr& sbRet,
+                                   int nBlockHeight) const EXCLUSIVE_LOCKS_REQUIRED(cs_sb);
+
+    mutable Mutex cs_sb;
+    std::atomic<bool> m_loaded{false};
+    std::map<uint256, TriggerEntry> m_triggers GUARDED_BY(cs_sb);
+};
+
+} // namespace governance
+
+#endif // BITCOIN_GOVERNANCE_SUPERBLOCK_H
diff --git a/src/governance/validators.cpp b/src/governance/validators.cpp
deleted file mode 100644
index a06bb3cc7ff8..000000000000
--- a/src/governance/validators.cpp
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright (c) 2014-2025 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <governance/common.h>
-
-#include <governance/validators.h>
-#include <util/std23.h>
-
-#include <key_io.h>
-#include <timedata.h>
-#include <tinyformat.h>
-#include <util/strencodings.h>
-
-#include <algorithm>
-
-const size_t MAX_DATA_SIZE = 512;
-const size_t MAX_NAME_SIZE = 40;
-
-CProposalValidator::CProposalValidator(const std::string& strHexData, bool fAllowScript) :
-    objJSON(UniValue::VOBJ),
-    fAllowScript(fAllowScript),
-    strErrorMessages()
-{
-    if (!strHexData.empty()) {
-        ParseStrHexData(strHexData);
-    }
-}
-
-void CProposalValidator::ParseStrHexData(const std::string& strHexData)
-{
-    std::vector<unsigned char> v = ParseHex(strHexData);
-    if (v.size() > MAX_DATA_SIZE) {
-        strErrorMessages = strprintf("data exceeds %lu characters;", MAX_DATA_SIZE);
-        return;
-    }
-    ParseJSONData(std::string(v.begin(), v.end()));
-}
-
-bool CProposalValidator::Validate(bool fCheckExpiration)
-{
-    if (!fJSONValid) {
-        strErrorMessages += "JSON parsing error;";
-        return false;
-    }
-    if (!ValidateType()) {
-        strErrorMessages += "Invalid type;";
-        return false;
-    }
-    if (!ValidateName()) {
-        strErrorMessages += "Invalid name;";
-        return false;
-    }
-    if (!ValidateStartEndEpoch(fCheckExpiration)) {
-        strErrorMessages += "Invalid start:end range;";
-        return false;
-    }
-    if (!ValidatePaymentAmount()) {
-        strErrorMessages += "Invalid payment amount;";
-        return false;
-    }
-    if (!ValidatePaymentAddress()) {
-        strErrorMessages += "Invalid payment address;";
-        return false;
-    }
-    if (!ValidateURL()) {
-        strErrorMessages += "Invalid URL;";
-        return false;
-    }
-    return true;
-}
-
-bool CProposalValidator::ValidateType()
-{
-    int64_t nType;
-    if (!GetDataValue("type", nType)) {
-        strErrorMessages += "type field not found;";
-        return false;
-    }
-
-    if (nType != std23::to_underlying(GovernanceObject::PROPOSAL)) {
-        strErrorMessages += strprintf("type is not %d;", std23::to_underlying(GovernanceObject::PROPOSAL));
-        return false;
-    }
-
-    return true;
-}
-
-bool CProposalValidator::ValidateName()
-{
-    std::string strName;
-    if (!GetDataValue("name", strName)) {
-        strErrorMessages += "name field not found;";
-        return false;
-    }
-
-    if (strName.size() > MAX_NAME_SIZE) {
-        strErrorMessages += strprintf("name exceeds %lu characters;", MAX_NAME_SIZE);
-        return false;
-    }
-
-    if (strName.empty()) {
-        strErrorMessages += "name cannot be empty;";
-        return false;
-    }
-
-    static constexpr std::string_view strAllowedChars{"-_abcdefghijklmnopqrstuvwxyz0123456789"};
-
-    strName = ToLower(strName);
-
-    if (strName.find_first_not_of(strAllowedChars) != std::string::npos) {
-        strErrorMessages += "name contains invalid characters;";
-        return false;
-    }
-
-    return true;
-}
-
-bool CProposalValidator::ValidateStartEndEpoch(bool fCheckExpiration)
-{
-    int64_t nStartEpoch = 0;
-    int64_t nEndEpoch = 0;
-
-    if (!GetDataValue("start_epoch", nStartEpoch)) {
-        strErrorMessages += "start_epoch field not found;";
-        return false;
-    }
-
-    if (!GetDataValue("end_epoch", nEndEpoch)) {
-        strErrorMessages += "end_epoch field not found;";
-        return false;
-    }
-
-    if (nEndEpoch <= nStartEpoch) {
-        strErrorMessages += "end_epoch <= start_epoch;";
-        return false;
-    }
-
-    if (fCheckExpiration && nEndEpoch <= GetAdjustedTime()) {
-        strErrorMessages += "expired;";
-        return false;
-    }
-
-    return true;
-}
-
-bool CProposalValidator::ValidatePaymentAmount()
-{
-    double dValue = 0.0;
-
-    if (!GetDataValue("payment_amount", dValue)) {
-        strErrorMessages += "payment_amount field not found;";
-        return false;
-    }
-
-    if (dValue <= 0.0) {
-        strErrorMessages += "payment_amount is negative;";
-        return false;
-    }
-
-    // TODO: Should check for an amount which exceeds the budget but this is
-    // currently difficult because start and end epochs are defined in terms of
-    // clock time instead of block height.
-
-    return true;
-}
-
-bool CProposalValidator::ValidatePaymentAddress()
-{
-    std::string strPaymentAddress;
-
-    if (!GetDataValue("payment_address", strPaymentAddress)) {
-        strErrorMessages += "payment_address field not found;";
-        return false;
-    }
-
-    if (std::find_if(strPaymentAddress.begin(), strPaymentAddress.end(), IsSpace) != strPaymentAddress.end()) {
-        strErrorMessages += "payment_address can't have whitespaces;";
-        return false;
-    }
-
-    CTxDestination dest = DecodeDestination(strPaymentAddress);
-    if (!IsValidDestination(dest)) {
-        strErrorMessages += "payment_address is invalid;";
-        return false;
-    }
-
-    const ScriptHash *scriptID = std::get_if<ScriptHash>(&dest);
-    if (!fAllowScript && scriptID) {
-        strErrorMessages += "script addresses are not supported;";
-        return false;
-    }
-
-    return true;
-}
-
-bool CProposalValidator::ValidateURL()
-{
-    std::string strURL;
-    if (!GetDataValue("url", strURL)) {
-        strErrorMessages += "url field not found;";
-        return false;
-    }
-
-    if (std::find_if(strURL.begin(), strURL.end(), IsSpace) != strURL.end()) {
-        strErrorMessages += "url can't have whitespaces;";
-        return false;
-    }
-
-    if (strURL.size() < 4U) {
-        strErrorMessages += "url too short;";
-        return false;
-    }
-
-    if (!CheckURL(strURL)) {
-        strErrorMessages += "url invalid;";
-        return false;
-    }
-
-    return true;
-}
-
-void CProposalValidator::ParseJSONData(const std::string& strJSONData)
-{
-    fJSONValid = false;
-
-    if (strJSONData.empty()) {
-        return;
-    }
-
-    try {
-        UniValue obj(UniValue::VOBJ);
-
-        obj.read(strJSONData);
-
-        if (obj.isObject()) {
-            objJSON = obj;
-        } else {
-            throw std::runtime_error("Proposal must be a JSON object");
-        }
-
-        fJSONValid = true;
-    } catch (std::exception& e) {
-        strErrorMessages += std::string(e.what()) + std::string(";");
-    } catch (...) {
-        strErrorMessages += "Unknown exception;";
-    }
-}
-
-bool CProposalValidator::GetDataValue(const std::string& strKey, std::string& strValueRet)
-{
-    bool fOK = false;
-    try {
-        strValueRet = objJSON[strKey].get_str();
-        fOK = true;
-    } catch (std::exception& e) {
-        strErrorMessages += std::string(e.what()) + std::string(";");
-    } catch (...) {
-        strErrorMessages += "Unknown exception;";
-    }
-    return fOK;
-}
-
-bool CProposalValidator::GetDataValue(const std::string& strKey, int64_t& nValueRet)
-{
-    bool fOK = false;
-    try {
-        const UniValue uValue = objJSON[strKey];
-        switch (uValue.getType()) {
-        case UniValue::VNUM:
-            nValueRet = uValue.getInt<int64_t>();
-            fOK = true;
-            break;
-        default:
-            break;
-        }
-    } catch (std::exception& e) {
-        strErrorMessages += std::string(e.what()) + std::string(";");
-    } catch (...) {
-        strErrorMessages += "Unknown exception;";
-    }
-    return fOK;
-}
-
-bool CProposalValidator::GetDataValue(const std::string& strKey, double& dValueRet)
-{
-    bool fOK = false;
-    try {
-        const UniValue uValue = objJSON[strKey];
-        switch (uValue.getType()) {
-        case UniValue::VNUM:
-            dValueRet = uValue.get_real();
-            fOK = true;
-            break;
-        default:
-            break;
-        }
-    } catch (std::exception& e) {
-        strErrorMessages += std::string(e.what()) + std::string(";");
-    } catch (...) {
-        strErrorMessages += "Unknown exception;";
-    }
-    return fOK;
-}
-
-/*
-  The purpose of this function is to replicate the behavior of the
-  Python urlparse function used by sentinel (urlparse.py).  This function
-  should return false whenever urlparse raises an exception and true
-  otherwise.
- */
-bool CProposalValidator::CheckURL(const std::string& strURLIn)
-{
-    std::string strRest(strURLIn);
-    std::string::size_type nPos = strRest.find(':');
-
-    if (nPos != std::string::npos) {
-        if (nPos < strRest.size()) {
-            strRest = strRest.substr(nPos + 1);
-        } else {
-            strRest = "";
-        }
-    }
-
-    // Process netloc
-    if ((strRest.size() > 2) && (strRest.substr(0, 2) == "//")) {
-        static constexpr std::string_view strNetlocDelimiters{"/?#"};
-
-        strRest = strRest.substr(2);
-
-        std::string::size_type nPos2 = strRest.find_first_of(strNetlocDelimiters);
-
-        std::string strNetloc = strRest.substr(0, nPos2);
-
-        if ((strNetloc.find('[') != std::string::npos) && (strNetloc.find(']') == std::string::npos)) {
-            return false;
-        }
-
-        if ((strNetloc.find(']') != std::string::npos) && (strNetloc.find('[') == std::string::npos)) {
-            return false;
-        }
-    }
-
-    return true;
-}
diff --git a/src/governance/validators.h b/src/governance/validators.h
deleted file mode 100644
index 39685e223d80..000000000000
--- a/src/governance/validators.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) 2014-2023 The Dash Core developers
-// Distributed under the MIT/X11 software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#ifndef BITCOIN_GOVERNANCE_VALIDATORS_H
-#define BITCOIN_GOVERNANCE_VALIDATORS_H
-
-#include <string>
-
-#include <univalue.h>
-
-class CProposalValidator
-{
-private:
-    UniValue objJSON;
-    bool fJSONValid{false};
-    bool fAllowScript;
-    std::string strErrorMessages;
-
-public:
-    explicit CProposalValidator(const std::string& strDataHexIn = std::string(), bool fAllowScript = true);
-
-    bool Validate(bool fCheckExpiration = true);
-
-    const std::string& GetErrorMessages() const
-    {
-        return strErrorMessages;
-    }
-
-private:
-    void ParseStrHexData(const std::string& strHexData);
-    void ParseJSONData(const std::string& strJSONData);
-
-    bool GetDataValue(const std::string& strKey, std::string& strValueRet);
-    bool GetDataValue(const std::string& strKey, int64_t& nValueRet);
-    bool GetDataValue(const std::string& strKey, double& dValueRet);
-
-    bool ValidateType();
-    bool ValidateName();
-    bool ValidateStartEndEpoch(bool fCheckExpiration = true);
-    bool ValidatePaymentAmount();
-    bool ValidatePaymentAddress();
-    bool ValidateURL();
-
-    bool CheckURL(const std::string& strURLIn);
-};
-
-#endif // BITCOIN_GOVERNANCE_VALIDATORS_H
diff --git a/src/governance/vote.h b/src/governance/vote.h
index 80877f93cba2..d5e5d96aaedb 100644
--- a/src/governance/vote.h
+++ b/src/governance/vote.h
@@ -12,7 +12,6 @@
 
 class CBLSPublicKey;
 class CDeterministicMNList;
-class CGovernanceVote;
 class CKeyID;
 
 // INTENTION OF MASTERNODES REGARDING ITEM
diff --git a/src/governance/votedb.cpp b/src/governance/votedb.cpp
index b1768f8b0346..dc0afa64262b 100644
--- a/src/governance/votedb.cpp
+++ b/src/governance/votedb.cpp
@@ -4,6 +4,8 @@
 
 #include <governance/votedb.h>
 
+#include <streams.h>
+
 CGovernanceObjectVoteFile::CGovernanceObjectVoteFile() :
     listVotes(),
     mapVoteIndex()
diff --git a/src/governance/votedb.h b/src/governance/votedb.h
index 169196cb9ff8..d38d9b87ebdd 100644
--- a/src/governance/votedb.h
+++ b/src/governance/votedb.h
@@ -7,13 +7,14 @@
 
 #include <governance/vote.h>
 #include <serialize.h>
-#include <streams.h>
 #include <uint256.h>
 
 #include <list>
 #include <map>
+#include <set>
 #include <vector>
 
+class CDataStream;
 class CDeterministicMNList;
 
 /**
diff --git a/src/init.cpp b/src/init.cpp
index 113bd4c9f025..8c71b38b0d2f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -370,9 +370,9 @@ void PrepareShutdown(NodeContext& node)
     // and reset all to nullptr.
     node.observer_ctx.reset();
     node.active_ctx.reset();
+    node.govman.reset();
     node.mn_sync.reset();
     node.sporkman.reset();
-    node.govman.reset();
     node.netfulfilledman.reset();
     node.mn_metaman.reset();
 
@@ -1959,7 +1959,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     assert(!node.mempool);
     assert(!node.chainman);
-    assert(!node.govman);
     assert(!node.mn_sync);
     const int mempool_check_ratio = std::clamp<int>(args.GetIntArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0, 1000000);
 
@@ -1979,8 +1978,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
          */
         node.mn_sync = std::make_unique<CMasternodeSync>(std::make_unique<NodeSyncNotifierImpl>(*node.connman, *node.netfulfilledman));
 
-        node.govman = std::make_unique<CGovernanceManager>(*node.mn_metaman, *node.chainman, node.dmnman, *node.mn_sync);
-
         const bool fReset = fReindex;
         bilingual_str strLoadError;
 
@@ -1990,7 +1987,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         try {
             maybe_load_error = LoadChainstate(fReset,
                                               chainman,
-                                              *node.govman,
                                               *node.mn_metaman,
                                               *node.mn_sync,
                                               *node.sporkman,
@@ -2173,10 +2169,13 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     node.clhandler = std::make_unique<chainlock::ChainlockHandler>(*node.chainlocks, chainman, *node.mempool, *node.mn_sync);
     RegisterValidationInterface(node.clhandler.get());
 
+    assert(!node.govman);
+    node.govman = std::make_unique<CGovernanceManager>(*node.mn_metaman, *node.chainman, *node.chain_helper->superblocks, *node.dmnman, *node.mn_sync);
+
     assert(!node.peerman);
     node.peerman = PeerManager::make(chainparams, *node.connman, *node.addrman, node.banman.get(), *node.dstxman,
                                      chainman, *node.mempool, *node.mn_metaman, *node.mn_sync,
-                                     *node.govman, *node.sporkman, *node.chainlocks, *node.clhandler, node.active_ctx, node.dmnman,
+                                     *node.sporkman, *node.chainlocks, *node.clhandler, node.active_ctx, node.dmnman,
                                      node.cj_walletman, node.llmq_ctx, node.observer_ctx, ignores_incoming_txs);
     RegisterValidationInterface(node.peerman.get());
 
@@ -2199,7 +2198,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
             return InitError(_("Invalid masternodeblsprivkey. Please see documentation."));
         }
         // Will init later in ThreadImport
-        node.active_ctx = std::make_unique<ActiveContext>(*node.llmq_ctx->bls_worker, chainman, *node.connman, *node.dmnman, *node.govman, *node.mn_metaman,
+        node.active_ctx = std::make_unique<ActiveContext>(*node.llmq_ctx->bls_worker, chainman, *node.connman, *node.dmnman,
+                                                          *node.govman, *node.chain_helper->superblocks, *node.mn_metaman,
                                                           *node.sporkman, *node.chainlocks, *node.mempool, *node.clhandler, *node.llmq_ctx->isman,
                                                           *node.llmq_ctx->quorum_block_processor, *node.llmq_ctx->qman, *node.llmq_ctx->qsnapman, *node.llmq_ctx->sigman,
                                                           *node.mn_sync, operator_sk, dash_db_params, quorums_watch);
@@ -2270,8 +2270,12 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
             }
             return InitError(strprintf(_("Failed to clear governance cache at %s"), file_path));
         }
-        node.peerman->AddExtraHandler(std::make_unique<NetGovernance>(node.peerman.get(), *node.govman, *node.mn_sync, *node.netfulfilledman, *node.connman));
     }
+    // Always register NetGovernance so it can suppress governance inv items in AlreadyHave()
+    // even when -disablegovernance is set. The handler's ProcessMessage/Schedule paths
+    // early-return on !IsValid(), and AlreadyHave() short-circuits to true so we don't grow
+    // m_requested_hash_time without a cleanup task.
+    node.peerman->AddExtraHandler(std::make_unique<NetGovernance>(node.peerman.get(), *node.govman, *node.mn_sync, *node.netfulfilledman, *node.connman));
     node.peerman->AddExtraHandler(std::make_unique<SyncManager>(node.peerman.get(), *node.govman, *node.mn_sync, *node.connman, *node.netfulfilledman));
 
     // ********************************************************* Step 8: start indexers
diff --git a/src/masternode/payments.cpp b/src/masternode/payments.cpp
index 01a379b1d1b8..4ed706847ab9 100644
--- a/src/masternode/payments.cpp
+++ b/src/masternode/payments.cpp
@@ -5,8 +5,7 @@
 #include <masternode/payments.h>
 
 #include <evo/deterministicmns.h>
-#include <governance/classes.h>
-#include <governance/governance.h>
+#include <governance/superblock.h>
 #include <masternode/sync.h>
 
 #include <chain.h>
@@ -232,7 +231,7 @@ bool CMNPaymentsProcessor::IsBlockValueValid(const CBlock& block, const int nBlo
         return false;
     }
 
-    if (!m_mn_sync.IsSynced() || !m_govman.IsValid()) {
+    if (!m_mn_sync.IsSynced() || !m_superblocks.IsValid()) {
         LogPrint(BCLog::MNPAYMENTS, "CMNPaymentsProcessor::%s -- WARNING! Not enough data, checked superblock max bounds only\n", __func__);
         // not enough data for full checks but at least we know that the superblock limits were honored.
         // We rely on the network to have followed the correct chain in this case
@@ -245,7 +244,7 @@ bool CMNPaymentsProcessor::IsBlockValueValid(const CBlock& block, const int nBlo
 
     const auto tip_mn_list = m_dmnman.GetListAtChainTip();
 
-    if (!m_govman.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
+    if (!m_superblocks.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
         // we are on a valid superblock height but a superblock was not triggered
         // revert to block reward limits in this case
         if(!isBlockRewardValueMet) {
@@ -256,7 +255,7 @@ bool CMNPaymentsProcessor::IsBlockValueValid(const CBlock& block, const int nBlo
     }
 
     // this actually also checks for correct payees and not only amount
-    if (!m_govman.IsValidSuperblock(m_chainman.ActiveChain(), tip_mn_list, *block.vtx[0], nBlockHeight, blockReward)) {
+    if (!m_superblocks.IsValidSuperblock(m_chainman.ActiveChain(), tip_mn_list, *block.vtx[0], nBlockHeight, blockReward)) {
         // triggered but invalid? that's weird
         LogPrintf("CMNPaymentsProcessor::%s -- ERROR! Invalid superblock detected at height %d: %s", __func__, nBlockHeight, block.vtx[0]->ToString()); /* Continued */
         // should NOT allow invalid superblocks, when superblocks are enabled
@@ -280,7 +279,7 @@ bool CMNPaymentsProcessor::IsBlockPayeeValid(const CTransaction& txNew, const CB
         return false;
     }
 
-    if (!m_mn_sync.IsSynced() || !m_govman.IsValid()) {
+    if (!m_mn_sync.IsSynced() || !m_superblocks.IsValid()) {
         // governance data is either incomplete or non-existent
         LogPrint(BCLog::MNPAYMENTS, "CMNPaymentsProcessor::%s -- WARNING! Not enough data, skipping superblock payee checks\n", __func__);
         return true;  // not an error
@@ -300,9 +299,9 @@ bool CMNPaymentsProcessor::IsBlockPayeeValid(const CTransaction& txNew, const CB
     if (!check_superblock) return true;
 
     const auto tip_mn_list = m_dmnman.GetListAtChainTip();
-    if (m_govman.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
-        if (m_govman.IsValidSuperblock(m_chainman.ActiveChain(), tip_mn_list, txNew, nBlockHeight,
-                                       blockSubsidy + feeReward)) {
+    if (m_superblocks.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
+        if (m_superblocks.IsValidSuperblock(m_chainman.ActiveChain(), tip_mn_list, txNew, nBlockHeight,
+                                            blockSubsidy + feeReward)) {
             LogPrint(BCLog::GOBJECT, "CMNPaymentsProcessor::%s -- Valid superblock at height %d: %s", /* Continued */
                      __func__, nBlockHeight, txNew.ToString());
             // continue validation, should also pay MN
@@ -326,9 +325,9 @@ void CMNPaymentsProcessor::FillBlockPayments(CMutableTransaction& txNew, const C
 
     // Only create superblocks when one is actually triggered.
     const auto tip_mn_list = m_dmnman.GetListAtChainTip();
-    if (m_govman.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
+    if (m_superblocks.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
         LogPrint(BCLog::GOBJECT, "CMNPaymentsProcessor::%s -- Triggered superblock creation at height %d\n", __func__, nBlockHeight);
-        m_govman.GetSuperblockPayments(tip_mn_list, nBlockHeight, voutSuperblockPaymentsRet);
+        m_superblocks.GetSuperblockPayments(tip_mn_list, nBlockHeight, voutSuperblockPaymentsRet);
     }
 
     if (!GetMasternodeTxOuts(pindexPrev, blockSubsidy, feeReward, voutMasternodePaymentsRet)) {
diff --git a/src/masternode/payments.h b/src/masternode/payments.h
index 358d58d00d44..2b7b662e600d 100644
--- a/src/masternode/payments.h
+++ b/src/masternode/payments.h
@@ -13,7 +13,6 @@
 class CBlock;
 class CBlockIndex;
 class CDeterministicMNManager;
-class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeSync;
 class CTransaction;
@@ -21,6 +20,9 @@ class CTxOut;
 
 struct CMutableTransaction;
 
+namespace governance {
+class SuperblockManager;
+}
 namespace Consensus { struct Params; }
 
 /**
@@ -33,7 +35,7 @@ class CMNPaymentsProcessor
 {
 private:
     CDeterministicMNManager& m_dmnman;
-    CGovernanceManager& m_govman;
+    governance::SuperblockManager& m_superblocks;
     const ChainstateManager& m_chainman;
     const Consensus::Params& m_consensus_params;
     const CMasternodeSync& m_mn_sync;
@@ -48,9 +50,16 @@ class CMNPaymentsProcessor
     [[nodiscard]] bool IsOldBudgetBlockValueValid(const CBlock& block, const int nBlockHeight, const CAmount blockReward, std::string& strErrorRet);
 
 public:
-    explicit CMNPaymentsProcessor(CDeterministicMNManager& dmnman, CGovernanceManager& govman, const ChainstateManager& chainman,
-                                  const Consensus::Params& consensus_params, const CMasternodeSync& mn_sync) :
-        m_dmnman{dmnman}, m_govman{govman}, m_chainman{chainman}, m_consensus_params{consensus_params}, m_mn_sync{mn_sync} {}
+    explicit CMNPaymentsProcessor(CDeterministicMNManager& dmnman, governance::SuperblockManager& superblocks,
+                                  const ChainstateManager& chainman, const Consensus::Params& consensus_params,
+                                  const CMasternodeSync& mn_sync) :
+        m_dmnman{dmnman},
+        m_superblocks{superblocks},
+        m_chainman{chainman},
+        m_consensus_params{consensus_params},
+        m_mn_sync{mn_sync}
+    {
+    }
 
     bool IsBlockValueValid(const CBlock& block, const int nBlockHeight, const CAmount blockReward, std::string& strErrorRet, const bool check_superblock);
     bool IsBlockPayeeValid(const CTransaction& txNew, const CBlockIndex* pindexPrev, const CAmount blockSubsidy, const CAmount feeReward, const bool check_superblock);
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 0179bf53cced..a3644ed2f2fd 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -48,7 +48,6 @@
 #include <evo/deterministicmns.h>
 #include <evo/mnauth.h>
 #include <evo/smldiff.h>
-#include <governance/governance.h>
 #include <instantsend/instantsend.h>
 #include <instantsend/lock.h>
 #include <llmq/blockprocessor.h>
@@ -586,7 +585,7 @@ class PeerManagerImpl final : public PeerManager
 public:
     PeerManagerImpl(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
                     CDSTXManager& dstxman, ChainstateManager& chainman, CTxMemPool& pool,
-                    CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                    CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
                     CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
                     chainlock::ChainlockHandler& clhandler,
                     const std::unique_ptr<ActiveContext>& active_ctx,
@@ -822,7 +821,6 @@ class PeerManagerImpl final : public PeerManager
     const std::unique_ptr<llmq::ObserverContext>& m_observer_ctx;
     CMasternodeMetaMan& m_mn_metaman;
     CMasternodeSync& m_mn_sync;
-    CGovernanceManager& m_govman;
     CSporkManager& m_sporkman;
     const chainlock::Chainlocks& m_chainlocks;
     // TODO: consider further refactoring ChainlockHandler to NetHandler to avoid boiler code in PeerManager
@@ -2063,7 +2061,7 @@ std::optional<std::string> PeerManagerImpl::FetchBlock(NodeId peer_id, const CBl
 std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman,
                                                BanMan* banman, CDSTXManager& dstxman, ChainstateManager& chainman,
                                                CTxMemPool& pool, CMasternodeMetaMan& mn_metaman,
-                                               CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                                               CMasternodeSync& mn_sync,
                                                CSporkManager& sporkman, const chainlock::Chainlocks& chainlocks,
                                                chainlock::ChainlockHandler& clhandler,
                                                const std::unique_ptr<ActiveContext>& active_ctx,
@@ -2072,12 +2070,12 @@ std::unique_ptr<PeerManager> PeerManager::make(const CChainParams& chainparams,
                                                const std::unique_ptr<LLMQContext>& llmq_ctx,
                                                const std::unique_ptr<llmq::ObserverContext>& observer_ctx, bool ignore_incoming_txs)
 {
-    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, govman, sporkman, chainlocks, clhandler, active_ctx, dmnman, cj_walletman, llmq_ctx, observer_ctx, ignore_incoming_txs);
+    return std::make_unique<PeerManagerImpl>(chainparams, connman, addrman, banman, dstxman, chainman, pool, mn_metaman, mn_sync, sporkman, chainlocks, clhandler, active_ctx, dmnman, cj_walletman, llmq_ctx, observer_ctx, ignore_incoming_txs);
 }
 
 PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman, BanMan* banman,
                                  CDSTXManager& dstxman, ChainstateManager& chainman, CTxMemPool& pool,
-                                 CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync, CGovernanceManager& govman,
+                                 CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
                                  CSporkManager& sporkman,
                                  const chainlock::Chainlocks& chainlocks,
                                  chainlock::ChainlockHandler& clhandler,
@@ -2100,7 +2098,6 @@ PeerManagerImpl::PeerManagerImpl(const CChainParams& chainparams, CConnman& conn
       m_observer_ctx(observer_ctx),
       m_mn_metaman(mn_metaman),
       m_mn_sync(mn_sync),
-      m_govman(govman),
       m_sporkman(sporkman),
       m_chainlocks(chainlocks),
       m_clhandler{clhandler},
@@ -2370,7 +2367,10 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
 
     case MSG_GOVERNANCE_OBJECT:
     case MSG_GOVERNANCE_OBJECT_VOTE:
-        return !m_govman.ConfirmInventoryRequest(inv);
+        for (const auto& handler : m_handlers) {
+            if (handler->AlreadyHave(inv)) return true;
+        }
+        return false;
 
     case MSG_QUORUM_FINAL_COMMITMENT:
         return m_llmq_ctx->quorum_block_processor->HasMineableCommitment(inv.hash);
@@ -2390,7 +2390,6 @@ bool PeerManagerImpl::AlreadyHave(const CInv& inv)
     case MSG_PLATFORM_BAN:
         return m_mn_metaman.AlreadyHavePlatformBan(inv.hash);
 
-    // At the end inventories that are handled by NetHandler
     case MSG_DSQ:
         if (m_cj_walletman && m_cj_walletman->hasQueue(inv.hash)) return true;
         for (const auto& handler : m_handlers) {
@@ -2937,36 +2936,6 @@ void PeerManagerImpl::ProcessGetData(CNode& pfrom, Peer& peer, const std::atomic
             }
         }
 
-        if (!push && inv.type == MSG_GOVERNANCE_OBJECT) {
-            CDataStream ss(SER_NETWORK, pfrom.GetCommonVersion());
-            bool topush = false;
-            if (m_govman.HaveObjectForHash(inv.hash)) {
-                ss.reserve(1000);
-                if (m_govman.SerializeObjectForHash(inv.hash, ss)) {
-                    topush = true;
-                }
-            }
-            if (topush) {
-                m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCEOBJECT, ss));
-                push = true;
-            }
-        }
-
-        if (!push && inv.type == MSG_GOVERNANCE_OBJECT_VOTE) {
-            CDataStream ss(SER_NETWORK, pfrom.GetCommonVersion());
-            bool topush = false;
-            if (m_govman.HaveVoteForHash(inv.hash)) {
-                ss.reserve(1000);
-                if (m_govman.SerializeVoteForHash(inv.hash, ss)) {
-                    topush = true;
-                }
-            }
-            if (topush) {
-                m_connman.PushMessage(&pfrom, msgMaker.Make(NetMsgType::MNGOVERNANCEOBJECTVOTE, ss));
-                push = true;
-            }
-        }
-
         if (!push && (inv.type == MSG_QUORUM_FINAL_COMMITMENT)) {
             llmq::CFinalCommitment o;
             if (m_llmq_ctx->quorum_block_processor->GetMineableCommitmentByHash(
diff --git a/src/net_processing.h b/src/net_processing.h
index 4967444fe346..e5f5132925f6 100644
--- a/src/net_processing.h
+++ b/src/net_processing.h
@@ -19,7 +19,6 @@ class CActiveMasternodeManager;
 class CCoinJoinQueue;
 class CDeterministicMNManager;
 class CDSTXManager;
-class CGovernanceManager;
 class ChainstateManager;
 class CInv;
 class CJWalletManager;
@@ -111,7 +110,7 @@ class PeerManager : public CValidationInterface, public NetEventsInterface, publ
     static std::unique_ptr<PeerManager> make(const CChainParams& chainparams, CConnman& connman, AddrMan& addrman,
                                              BanMan* banman, CDSTXManager& dstxman, ChainstateManager& chainman,
                                              CTxMemPool& pool, CMasternodeMetaMan& mn_metaman, CMasternodeSync& mn_sync,
-                                             CGovernanceManager& govman, CSporkManager& sporkman,
+                                             CSporkManager& sporkman,
                                              const chainlock::Chainlocks& chainlocks,
                                              chainlock::ChainlockHandler& clhandler,
                                              const std::unique_ptr<ActiveContext>& active_ctx,
diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp
index a7bfb33fd133..27a9ccc13761 100644
--- a/src/node/chainstate.cpp
+++ b/src/node/chainstate.cpp
@@ -35,7 +35,6 @@
 namespace node {
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
-                                                     CGovernanceManager& govman,
                                                      CMasternodeMetaMan& mn_metaman,
                                                      CMasternodeSync& mn_sync,
                                                      CSporkManager& sporkman,
@@ -83,7 +82,7 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
     pblocktree.reset();
     pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, block_tree_db_in_memory, fReset));
 
-    DashChainstateSetup(chainman, govman, mn_metaman, mn_sync, sporkman, chainlocks, chain_helper,
+    DashChainstateSetup(chainman, mn_metaman, mn_sync, sporkman, chainlocks, chain_helper,
                         dmnman, *evodb, llmq_ctx, mempool, data_dir, dash_dbs_in_memory,
                         /*llmq_dbs_wipe=*/fReset || fReindexChainState, bls_threads, worker_count,
                         max_recsigs_age, consensus_params);
@@ -207,7 +206,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
 }
 
 void DashChainstateSetup(ChainstateManager& chainman,
-                         CGovernanceManager& govman,
                          CMasternodeMetaMan& mn_metaman,
                          CMasternodeSync& mn_sync,
                          CSporkManager& sporkman,
@@ -237,7 +235,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
         mempool->ConnectManagers(dmnman.get(), llmq_ctx->isman.get());
     }
     chain_helper.reset();
-    chain_helper = std::make_unique<CChainstateHelper>(evodb, *dmnman, govman, *(llmq_ctx->isman), *(llmq_ctx->quorum_block_processor),
+    chain_helper = std::make_unique<CChainstateHelper>(evodb, *dmnman, *(llmq_ctx->isman), *(llmq_ctx->quorum_block_processor),
                                                        *(llmq_ctx->qsnapman), chainman, consensus_params, mn_sync, chainlocks,
                                                        *(llmq_ctx->qman));
 }
diff --git a/src/node/chainstate.h b/src/node/chainstate.h
index 09adc7cdf214..a97ea89c8e3e 100644
--- a/src/node/chainstate.h
+++ b/src/node/chainstate.h
@@ -14,7 +14,6 @@
 class CChainstateHelper;
 class CDeterministicMNManager;
 class CEvoDB;
-class CGovernanceManager;
 class ChainstateManager;
 class CMasternodeMetaMan;
 class CMasternodeSync;
@@ -78,7 +77,6 @@ enum class ChainstateLoadingError {
  */
 std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
                                                      ChainstateManager& chainman,
-                                                     CGovernanceManager& govman,
                                                      CMasternodeMetaMan& mn_metaman,
                                                      CMasternodeSync& mn_sync,
                                                      CSporkManager& sporkman,
@@ -109,7 +107,6 @@ std::optional<ChainstateLoadingError> LoadChainstate(bool fReset,
 
 /** Initialize Dash-specific components during chainstate initialization */
 void DashChainstateSetup(ChainstateManager& chainman,
-                         CGovernanceManager& govman,
                          CMasternodeMetaMan& mn_metaman,
                          CMasternodeSync& mn_sync,
                          CSporkManager& sporkman,
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
index f5172c1da9c3..d9fe93f70e41 100644
--- a/src/node/interfaces.cpp
+++ b/src/node/interfaces.cpp
@@ -15,11 +15,10 @@
 #include <evo/chainhelper.h>
 #include <evo/creditpool.h>
 #include <evo/deterministicmns.h>
-#include <governance/classes.h>
-#include <governance/exceptions.h>
 #include <external_signer.h>
 #include <governance/governance.h>
 #include <governance/object.h>
+#include <governance/superblock.h>
 #include <governance/vote.h>
 #include <index/blockfilterindex.h>
 #include <init.h>
@@ -65,7 +64,7 @@
 #include <validationinterface.h>
 #include <warnings.h>
 
-#include <governance/validators.h>
+#include <governance/common.h>
 
 #if defined(HAVE_CONFIG_H)
 #include <config/bitcoin-config.h>
@@ -309,9 +308,9 @@ class GOVImpl : public GOV
     }
     std::optional<int32_t> getProposalFundedHeight(const uint256& proposal_hash) override
     {
-        if (context().govman != nullptr && context().chainman != nullptr) {
+        if (context().chain_helper != nullptr && context().chainman != nullptr) {
             const int32_t nTipHeight = context().chainman->ActiveHeight();
-            for (const auto& trigger : context().govman->GetActiveTriggers()) {
+            for (const auto& trigger : context().chain_helper->superblocks->GetActiveTriggers()) {
                 if (!trigger || trigger->GetBlockHeight() > nTipHeight) continue;
                 for (const auto& hash : trigger->GetProposalHashes()) {
                     if (hash == proposal_hash) {
@@ -359,9 +358,9 @@ class GOVImpl : public GOV
             error = "Invalid object type, only proposals can be validated";
             return std::nullopt;
         }
-        CProposalValidator validator(data_hex);
-        if (!validator.Validate()) {
-            error = "Invalid proposal data: " + validator.GetErrorMessages();
+        std::string strValidationError;
+        if (!governance::ValidateProposal(data_hex, strValidationError)) {
+            error = "Invalid proposal data: " + strValidationError;
             return std::nullopt;
         }
         const ChainstateManager& chainman = *Assert(context().chainman);
@@ -385,8 +384,8 @@ class GOVImpl : public GOV
         CGovernanceObject govobj(parent, revision, created_time, fee_txid, data_hex);
         if (govobj.GetObjectType() == GovernanceObject::TRIGGER) { error = "Submission of triggers is not available"; return false; }
         if (govobj.GetObjectType() == GovernanceObject::PROPOSAL) {
-            CProposalValidator validator(data_hex);
-            if (!validator.Validate()) { error = "Invalid proposal data: " + validator.GetErrorMessages(); return false; }
+            std::string strValidationError;
+            if (!governance::ValidateProposal(data_hex, strValidationError)) { error = "Invalid proposal data: " + strValidationError; return false; }
         }
         const CTxMemPool& mempool = *Assert(context().mempool);
         bool fMissingConfirmations{false};
diff --git a/src/qt/proposalcreate.cpp b/src/qt/proposalcreate.cpp
index 322e9ef475e0..f2e3d47f5938 100644
--- a/src/qt/proposalcreate.cpp
+++ b/src/qt/proposalcreate.cpp
@@ -6,7 +6,6 @@
 #include <qt/forms/ui_proposalcreate.h>
 
 #include <governance/object.h>
-#include <governance/validators.h>
 #include <interfaces/node.h>
 #include <util/moneystr.h>
 #include <util/strencodings.h>
@@ -254,12 +253,12 @@ void ProposalCreate::validateFields()
     }
 
     buildJsonAndHex();
-    CProposalValidator validator(m_hex.toStdString());
-    if (validator.Validate()) {
+    std::string strValidationError;
+    if (governance::ValidateProposal(m_hex.toStdString(), strValidationError)) {
         m_ui->labelError->clear();
     } else {
         // Show first error only
-        QString errors = QString::fromStdString(validator.GetErrorMessages());
+        QString errors = QString::fromStdString(strValidationError);
         if (int semicolon = errors.indexOf(';'); semicolon > 0) {
             errors = errors.left(semicolon);
         }
diff --git a/src/qt/proposallist.cpp b/src/qt/proposallist.cpp
index 27241a021726..7b69e03f7479 100644
--- a/src/qt/proposallist.cpp
+++ b/src/qt/proposallist.cpp
@@ -7,6 +7,7 @@
 #include <chainparams.h>
 #include <governance/common.h>
 #include <governance/governance.h>
+#include <governance/object.h>
 #include <governance/vote.h>
 #include <interfaces/node.h>
 #include <interfaces/wallet.h>
diff --git a/src/qt/proposalmodel.cpp b/src/qt/proposalmodel.cpp
index 8580075cc021..90add7ae2300 100644
--- a/src/qt/proposalmodel.cpp
+++ b/src/qt/proposalmodel.cpp
@@ -4,8 +4,8 @@
 
 #include <qt/proposalmodel.h>
 
-#include <governance/classes.h>
 #include <governance/object.h>
+#include <governance/superblock.h>
 #include <governance/vote.h>
 
 #include <qt/guiutil_font.h>
diff --git a/src/qt/proposalresume.cpp b/src/qt/proposalresume.cpp
index 6b1fcd641563..51243d676d0d 100644
--- a/src/qt/proposalresume.cpp
+++ b/src/qt/proposalresume.cpp
@@ -6,13 +6,13 @@
 #include <qt/forms/ui_proposalresume.h>
 
 #include <governance/governance.h>
+#include <governance/object.h>
+#include <interfaces/node.h>
+#include <interfaces/wallet.h>
 
 #include <qt/guiutil_font.h>
 #include <qt/proposalmodel.h>
 
-#include <interfaces/node.h>
-#include <interfaces/wallet.h>
-
 #include <qt/bitcoinunits.h>
 #include <qt/clientmodel.h>
 #include <qt/optionsmodel.h>
diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp
index e188d5c89a81..45410d558fb1 100644
--- a/src/rpc/governance.cpp
+++ b/src/rpc/governance.cpp
@@ -5,10 +5,10 @@
 #include <active/context.h>
 #include <active/masternode.h>
 #include <evo/deterministicmns.h>
-#include <governance/classes.h>
 #include <governance/common.h>
 #include <governance/governance.h>
-#include <governance/validators.h>
+#include <governance/object.h>
+#include <governance/superblock.h>
 #include <governance/vote.h>
 #include <masternode/sync.h>
 
@@ -123,9 +123,9 @@ static RPCHelpMan gobject_check()
     CGovernanceObject govobj(hashParent, nRevision, nTime, uint256(), strDataHex);
 
     if (govobj.GetObjectType() == GovernanceObject::PROPOSAL) {
-        CProposalValidator validator(strDataHex);
-        if (!validator.Validate())  {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + validator.GetErrorMessages());
+        std::string strValidationError;
+        if (!governance::ValidateProposal(strDataHex, strValidationError)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + strValidationError);
         }
     } else {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid object type, only proposals can be validated");
@@ -194,9 +194,9 @@ static RPCHelpMan gobject_prepare()
                 govobj.GetDataAsPlainString(), govobj.GetHash().ToString());
 
     if (govobj.GetObjectType() == GovernanceObject::PROPOSAL) {
-        CProposalValidator validator(strDataHex);
-        if (!validator.Validate()) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + validator.GetErrorMessages());
+        std::string strValidationError;
+        if (!governance::ValidateProposal(strDataHex, strValidationError)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + strValidationError);
         }
     }
 
@@ -376,9 +376,9 @@ static RPCHelpMan gobject_submit()
     }
 
     if (govobj.GetObjectType() == GovernanceObject::PROPOSAL) {
-        CProposalValidator validator(strDataHex);
-        if (!validator.Validate()) {
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + validator.GetErrorMessages());
+        std::string strValidationError;
+        if (!governance::ValidateProposal(strDataHex, strValidationError)) {
+            throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid proposal data, error messages: " + strValidationError);
         }
     }
 
diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp
index 201d126e5252..14e940b61136 100644
--- a/src/rpc/masternode.cpp
+++ b/src/rpc/masternode.cpp
@@ -7,7 +7,7 @@
 #include <evo/assetlocktx.h>
 #include <evo/chainhelper.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance.h>
+#include <governance/superblock.h>
 #include <masternode/payments.h>
 #include <rpc/evo_util.h>
 
@@ -222,7 +222,9 @@ static RPCHelpMan masternode_status()
     };
 }
 
-static std::string GetRequiredPaymentsString(CGovernanceManager& govman, const CDeterministicMNList& tip_mn_list, int nBlockHeight, const CDeterministicMNCPtr &payee)
+static std::string GetRequiredPaymentsString(governance::SuperblockManager& superblocks,
+                                             const CDeterministicMNList& tip_mn_list, int nBlockHeight,
+                                             const CDeterministicMNCPtr& payee)
 {
     std::string strPayments = "Unknown";
     if (payee) {
@@ -238,9 +240,9 @@ static std::string GetRequiredPaymentsString(CGovernanceManager& govman, const C
             strPayments += ", " + EncodeDestination(dest);
         }
     }
-    if (govman.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
+    if (superblocks.IsSuperblockTriggered(tip_mn_list, nBlockHeight)) {
         std::vector<CTxOut> voutSuperblock;
-        if (!govman.GetSuperblockPayments(tip_mn_list, nBlockHeight, voutSuperblock)) {
+        if (!superblocks.GetSuperblockPayments(tip_mn_list, nBlockHeight, voutSuperblock)) {
             return strPayments + ", error";
         }
         std::string strSBPayees = "Unknown";
@@ -305,7 +307,8 @@ static RPCHelpMan masternode_winners()
         const CBlockIndex* pIndex = pindexTip->GetAncestor(h - 1);
         auto payee = node.dmnman->GetListForBlock(pIndex).GetMNPayee(pIndex);
         if (payee) {
-            std::string strPayments = GetRequiredPaymentsString(*CHECK_NONFATAL(node.govman), tip_mn_list, h, payee);
+            std::string strPayments = GetRequiredPaymentsString(*CHECK_NONFATAL(node.chain_helper)->superblocks,
+                                                                tip_mn_list, h, payee);
             if (!strFilter.empty() && strPayments.find(strFilter) == std::string::npos) continue;
             obj.pushKV(strprintf("%d", h), strPayments);
         }
@@ -314,7 +317,7 @@ static RPCHelpMan masternode_winners()
     auto projection = node.dmnman->GetListForBlock(pindexTip).GetProjectedMNPayees(pindexTip, /*nCount=*/20);
     for (size_t i = 0; i < projection.size(); i++) {
         int h = nChainTipHeight + 1 + i;
-        std::string strPayments = GetRequiredPaymentsString(*node.govman, tip_mn_list, h, projection[i]);
+        std::string strPayments = GetRequiredPaymentsString(*node.chain_helper->superblocks, tip_mn_list, h, projection[i]);
         if (!strFilter.empty() && strPayments.find(strFilter) == std::string::npos) continue;
         obj.pushKV(strprintf("%d", h), strPayments);
     }
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 385240ee1e93..d060269f10c9 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -14,7 +14,7 @@
 #include <core_io.h>
 #include <deploymentinfo.h>
 #include <deploymentstatus.h>
-#include <governance/classes.h>
+#include <governance/superblock.h>
 #include <key_io.h>
 #include <llmq/blockprocessor.h>
 #include <llmq/context.h>
diff --git a/src/test/governance_validators_tests.cpp b/src/test/governance_validators_tests.cpp
index 331ce67fa828..c79dcb915a7a 100644
--- a/src/test/governance_validators_tests.cpp
+++ b/src/test/governance_validators_tests.cpp
@@ -2,7 +2,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/validators.h>
+#include <governance/object.h>
 #include <util/strencodings.h>
 
 #include <test/data/proposals_invalid.json.h>
@@ -45,15 +45,20 @@ BOOST_AUTO_TEST_CASE(valid_proposals_test)
 
         // legacy format
         std::string strHexData1 = CreateEncodedProposalObject(objProposal);
-        CProposalValidator validator0(strHexData1, fAllowScript);
-        BOOST_CHECK(!validator0.Validate());
-        BOOST_CHECK_EQUAL(validator0.GetErrorMessages(), "Proposal must be a JSON object;JSON parsing error;");
+        std::string strErrorMessages;
+        BOOST_CHECK(!governance::ValidateProposal(strHexData1, strErrorMessages, /*fCheckExpiration=*/true, fAllowScript));
+        BOOST_CHECK_EQUAL(strErrorMessages, "Proposal must be a JSON object;JSON parsing error;");
 
         // current format
         std::string strHexData2 = HexStr(objProposal.write());
-        CProposalValidator validator2(strHexData2, fAllowScript);
-        BOOST_CHECK_MESSAGE(validator2.Validate(false), validator2.GetErrorMessages());
-        BOOST_CHECK_MESSAGE(!validator2.Validate(), validator2.GetErrorMessages());
+        std::string strErrorMessages2;
+        BOOST_CHECK_MESSAGE(governance::ValidateProposal(strHexData2, strErrorMessages2, /*fCheckExpiration=*/false,
+                                                         fAllowScript),
+                            strErrorMessages2);
+        std::string strErrorMessages3;
+        BOOST_CHECK_MESSAGE(!governance::ValidateProposal(strHexData2, strErrorMessages3, /*fCheckExpiration=*/true,
+                                                          fAllowScript),
+                            strErrorMessages3);
     }
 }
 
@@ -69,14 +74,20 @@ BOOST_AUTO_TEST_CASE(invalid_proposals_test)
 
         // legacy format
         std::string strHexData1 = CreateEncodedProposalObject(objProposal);
-        CProposalValidator validator1(strHexData1, false);
-        BOOST_CHECK(!validator1.Validate());
-        BOOST_CHECK_MESSAGE(!validator1.Validate(false), validator1.GetErrorMessages());
+        std::string strErrorMessages1;
+        BOOST_CHECK(!governance::ValidateProposal(strHexData1, strErrorMessages1, /*fCheckExpiration=*/true,
+                                                  /*fAllowScript=*/false));
+        std::string strErrorMessages1b;
+        BOOST_CHECK_MESSAGE(!governance::ValidateProposal(strHexData1, strErrorMessages1b, /*fCheckExpiration=*/false,
+                                                          /*fAllowScript=*/false),
+                            strErrorMessages1b);
 
         // current format
         std::string strHexData2 = HexStr(objProposal.write());
-        CProposalValidator validator2(strHexData2, false);
-        BOOST_CHECK_MESSAGE(!validator2.Validate(false), validator2.GetErrorMessages());
+        std::string strErrorMessages2;
+        BOOST_CHECK_MESSAGE(!governance::ValidateProposal(strHexData2, strErrorMessages2, /*fCheckExpiration=*/false,
+                                                          /*fAllowScript=*/false),
+                            strErrorMessages2);
     }
 }
 
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index 8a96cb0c9ba4..9038f27b1cd0 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -134,7 +134,7 @@ std::unique_ptr<PeerManager> MakePeerManager(CConnman& connman,
                                              bool ignore_incoming_txs)
 {
     return PeerManager::make(chainparams, connman, *node.addrman, banman, *node.dstxman, *node.chainman, *node.mempool, *node.mn_metaman,
-                             *node.mn_sync, *node.govman, *node.sporkman, *node.chainlocks, *node.clhandler, node.active_ctx, node.dmnman, node.cj_walletman,
+                             *node.mn_sync, *node.sporkman, *node.chainlocks, *node.clhandler, node.active_ctx, node.dmnman, node.cj_walletman,
                              node.llmq_ctx, node.observer_ctx, ignore_incoming_txs);
 }
 
@@ -144,7 +144,7 @@ void DashChainstateSetup(ChainstateManager& chainman,
                          bool llmq_dbs_wipe,
                          const Consensus::Params& consensus_params)
 {
-    DashChainstateSetup(chainman, *Assert(node.govman.get()), *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
+    DashChainstateSetup(chainman, *Assert(node.mn_metaman.get()), *Assert(node.mn_sync.get()),
                         *Assert(node.sporkman.get()), *Assert(node.chainlocks), node.chain_helper, node.dmnman, *node.evodb,
                         node.llmq_ctx, Assert(node.mempool.get()), node.args->GetDataDirNet(), llmq_dbs_in_memory, llmq_dbs_wipe,
                         llmq::DEFAULT_BLSCHECK_THREADS, llmq::DEFAULT_WORKER_COUNT, llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE,
@@ -288,7 +288,6 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve
     m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(m_cache_sizes.block_tree_db, true);
 
     m_node.mn_sync = std::make_unique<CMasternodeSync>(std::make_unique<NodeSyncNotifierImpl>(*m_node.connman, *m_node.netfulfilledman));
-    m_node.govman = std::make_unique<CGovernanceManager>(*m_node.mn_metaman, *m_node.chainman, m_node.dmnman, *m_node.mn_sync);
 
     m_node.clhandler = std::make_unique<chainlock::ChainlockHandler>(*m_node.chainlocks, *m_node.chainman, *m_node.mempool, *m_node.mn_sync);
 
@@ -304,7 +303,6 @@ ChainTestingSetup::~ChainTestingSetup()
     StopScriptCheckWorkerThreads();
     GetMainSignals().FlushBackgroundCallbacks();
     GetMainSignals().UnregisterBackgroundSignalScheduler();
-    m_node.govman.reset();
     m_node.mn_sync.reset();
     m_node.chainman.reset();
     m_node.mempool.reset();
@@ -318,7 +316,6 @@ void ChainTestingSetup::LoadVerifyActivateChainstate()
     auto& chainman{*Assert(m_node.chainman)};
     auto maybe_load_error = LoadChainstate(fReindex.load(),
                                            chainman,
-                                           *Assert(m_node.govman.get()),
                                            *Assert(m_node.mn_metaman.get()),
                                            *Assert(m_node.mn_sync.get()),
                                            *Assert(m_node.sporkman.get()),
@@ -346,6 +343,8 @@ void ChainTestingSetup::LoadVerifyActivateChainstate()
                                            llmq::DEFAULT_MAX_RECOVERED_SIGS_AGE);
     assert(!maybe_load_error.has_value());
 
+    m_node.govman = std::make_unique<CGovernanceManager>(*m_node.mn_metaman, *m_node.chainman, *m_node.chain_helper->superblocks, *m_node.dmnman, *m_node.mn_sync);
+
     auto maybe_verify_error = VerifyLoadedChainstate(
         chainman,
         *Assert(m_node.evodb.get()),
@@ -432,6 +431,11 @@ TestingSetup::~TestingSetup()
         m_node.connman->Stop();
     }
 
+    // govman holds a reference to chain_helper->superblocks, so it must be reset
+    // before DashChainstateSetupClose() destroys chain_helper (matches PrepareShutdown
+    // ordering in init.cpp).
+    m_node.govman.reset();
+
     // DashChainstateSetup() is called by LoadChainstate() internally but
     // winding them down is our responsibility
     DashChainstateSetupClose(m_node);
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
index 3e834c185cc0..d79475001c88 100644
--- a/src/wallet/interfaces.cpp
+++ b/src/wallet/interfaces.cpp
@@ -33,7 +33,6 @@
 #include <wallet/wallet.h>
 #include <wallet/hdchain.h>
 #include <wallet/scriptpubkeyman.h>
-#include <governance/validators.h>
 #include <evo/deterministicmns.h>
 #include <masternode/sync.h>
 #include <txdb.h>
diff --git a/test/functional/feature_governance_cl.py b/test/functional/feature_governance_cl.py
index 3c6ef7356397..9c9991e70dac 100755
--- a/test/functional/feature_governance_cl.py
+++ b/test/functional/feature_governance_cl.py
@@ -158,7 +158,7 @@ def governance_tip_updated(node):
 
         self.log.info("Bump mocktime to trigger governance cleanup")
         for delta, expected in (
-            (5 * 60, ['CleanAndRemoveTriggers -- Removing trigger object']),  # mark old triggers for deletion
+            (5 * 60, ['SuperblockManager::Clean -- Removing trigger object']),  # mark old triggers for deletion
             (10 * 60, ['UpdateCachesAndClean -- Governance Objects: 0']),  # deletion after delay
         ):
             self.mocktime += delta
diff --git a/test/lint/lint-circular-dependencies.py b/test/lint/lint-circular-dependencies.py
index cb3f4c80e89a..eb23208e5971 100755
--- a/test/lint/lint-circular-dependencies.py
+++ b/test/lint/lint-circular-dependencies.py
@@ -37,8 +37,6 @@
     "evo/providertx -> validation -> txmempool -> evo/providertx",
     "evo/smldiff -> llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> evo/smldiff",
     "evo/specialtxman -> validation -> evo/specialtxman",
-    "governance/classes -> governance/object -> governance/governance -> governance/classes",
-    "governance/governance -> governance/signing -> governance/object -> governance/governance",
     "instantsend/instantsend -> node/blockstorage -> validation -> txmempool -> instantsend/instantsend",
     "llmq/blockprocessor -> llmq/utils -> llmq/snapshot -> llmq/blockprocessor",
     "llmq/commitment -> llmq/utils -> llmq/snapshot -> llmq/commitment",