diff --git a/Cargo.lock b/Cargo.lock
index d563d2fe9..140a1414b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1772,6 +1772,7 @@ dependencies = [
  "cw-controllers 1.1.2",
  "cw-hooks 2.5.0",
  "cw-multi-test",
+ "cw-orch",
  "cw-ownable",
  "cw-paginate-storage 2.5.0",
  "cw-storage-plus 1.2.0",
@@ -1795,6 +1796,7 @@ dependencies = [
  "cosmwasm-std",
  "cw-controllers 1.1.2",
  "cw-multi-test",
+ "cw-orch",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
@@ -1815,6 +1817,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-multi-test",
+ "cw-orch",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
@@ -2355,6 +2358,7 @@ dependencies = [
  "cw-denom 2.5.0",
  "cw-hooks 2.5.0",
  "cw-multi-test",
+ "cw-orch",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
@@ -2464,6 +2468,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-multi-test",
+ "cw-orch",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
@@ -2486,6 +2491,7 @@ dependencies = [
  "cosmwasm-std",
  "cw-hooks 2.5.0",
  "cw-multi-test",
+ "cw-orch",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
@@ -2533,6 +2539,7 @@ dependencies = [
  "cw-denom 2.5.0",
  "cw-hooks 2.5.0",
  "cw-multi-test",
+ "cw-orch",
  "cw-storage-plus 1.2.0",
  "cw-utils 1.0.3",
  "cw2 1.1.2",
@@ -2594,6 +2601,7 @@ dependencies = [
  "cw-denom 2.5.0",
  "cw-hooks 2.5.0",
  "cw-multi-test",
+ "cw-orch",
  "cw-proposal-single",
  "cw-storage-plus 1.2.0",
  "cw-utils 0.13.4",
@@ -2675,6 +2683,7 @@ dependencies = [
  "cosmwasm-schema",
  "cosmwasm-std",
  "cw-multi-test",
+ "cw-orch",
  "cw-ownable",
  "cw-storage-plus 1.2.0",
  "cw-tokenfactory-issuer",
diff --git a/Cargo.toml b/Cargo.toml
index 1d98d3a94..79011d8c7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -80,6 +80,7 @@ syn = { version = "1.0", features = ["derive"] }
 test-context = "0.1"
 thiserror = { version = "1.0" }
 wynd-utils = "0.4"
+cw-orch = "0.22.2"
 
 # One commit ahead of version 0.3.0. Allows initialization with an
 # optional owner.
diff --git a/contracts/dao-dao-core/Cargo.toml b/contracts/dao-dao-core/Cargo.toml
index 2f25f621c..ce2f09727 100644
--- a/contracts/dao-dao-core/Cargo.toml
+++ b/contracts/dao-dao-core/Cargo.toml
@@ -35,7 +35,7 @@ abstract-cw-plus-interface = "2.0.1"
 abstract-cw20 = "2.0.0"
 abstract-cw20-base = "2.0.0"
 cw-multi-test = { workspace = true }
-cw-orch = "0.22.2"
+cw-orch = {workspace = true}
 cw20-base = { workspace = true }
 cw721-base = { workspace = true }
 dao-cw-orch = { path = "../../packages/cw-orch" }
diff --git a/contracts/proposal/dao-proposal-condorcet/Cargo.toml b/contracts/proposal/dao-proposal-condorcet/Cargo.toml
index a53910b27..a9326a4c6 100644
--- a/contracts/proposal/dao-proposal-condorcet/Cargo.toml
+++ b/contracts/proposal/dao-proposal-condorcet/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name ="dao-proposal-condorcet"
+name = "dao-proposal-condorcet"
 authors = ["ekez <ekez@withoutdoing.com>"]
 description = "A DAO DAO proposal module with ranked-choice, Condorcet voting."
 edition = { workspace = true }
@@ -26,6 +26,7 @@ dao-voting = { workspace = true }
 dao-dao-macros = { workspace = true }
 dao-interface = { workspace = true }
 thiserror = { workspace = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }
diff --git a/contracts/proposal/dao-proposal-condorcet/src/msg.rs b/contracts/proposal/dao-proposal-condorcet/src/msg.rs
index ab6f5aa12..684108444 100644
--- a/contracts/proposal/dao-proposal-condorcet/src/msg.rs
+++ b/contracts/proposal/dao-proposal-condorcet/src/msg.rs
@@ -13,6 +13,7 @@ pub struct Choice {
 }
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     Propose { choices: Vec<Choice> },
     Vote { proposal_id: u32, vote: Vec<u32> },
@@ -23,7 +24,7 @@ pub enum ExecuteMsg {
 
 #[proposal_module_query]
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(crate::proposal::ProposalResponse)]
     Proposal { id: u32 },
diff --git a/contracts/proposal/dao-proposal-multiple/Cargo.toml b/contracts/proposal/dao-proposal-multiple/Cargo.toml
index 5eca7e2df..e9d1f90c2 100644
--- a/contracts/proposal/dao-proposal-multiple/Cargo.toml
+++ b/contracts/proposal/dao-proposal-multiple/Cargo.toml
@@ -39,6 +39,7 @@ cw-hooks = { workspace = true }
 dao-hooks = { workspace = true }
 dao-pre-propose-multiple = { workspace = true }
 voting-v1 = { workspace = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 anyhow = { workspace = true }
diff --git a/contracts/proposal/dao-proposal-multiple/src/msg.rs b/contracts/proposal/dao-proposal-multiple/src/msg.rs
index 1ed54db93..071e8d802 100644
--- a/contracts/proposal/dao-proposal-multiple/src/msg.rs
+++ b/contracts/proposal/dao-proposal-multiple/src/msg.rs
@@ -48,6 +48,7 @@ pub struct InstantiateMsg {
 }
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     /// Creates a proposal in the governance module.
     Propose(MultipleChoiceProposeMsg),
@@ -147,7 +148,7 @@ pub enum ExecuteMsg {
 
 #[proposal_module_query]
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     /// Gets the governance module's config.
     #[returns(crate::state::Config)]
diff --git a/contracts/proposal/dao-proposal-single/Cargo.toml b/contracts/proposal/dao-proposal-single/Cargo.toml
index 06170dd00..6f694fe09 100644
--- a/contracts/proposal/dao-proposal-single/Cargo.toml
+++ b/contracts/proposal/dao-proposal-single/Cargo.toml
@@ -34,6 +34,7 @@ thiserror = { workspace = true }
 cw-utils-v1 = { workspace = true}
 voting-v1 = { workspace = true }
 cw-proposal-single-v1 = { workspace = true, features = ["library"] }
+cw-orch = {workspace = true}
 
 [dev-dependencies]
 anyhow = { workspace = true }
diff --git a/contracts/proposal/dao-proposal-single/src/msg.rs b/contracts/proposal/dao-proposal-single/src/msg.rs
index 302303b48..82e75f22f 100644
--- a/contracts/proposal/dao-proposal-single/src/msg.rs
+++ b/contracts/proposal/dao-proposal-single/src/msg.rs
@@ -47,6 +47,7 @@ pub struct InstantiateMsg {
 }
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     /// Creates a proposal in the module.
     Propose(SingleChoiceProposeMsg),
@@ -147,7 +148,7 @@ pub enum ExecuteMsg {
 
 #[proposal_module_query]
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     /// Gets the proposal module's config.
     #[returns(crate::state::Config)]
diff --git a/contracts/staking/cw20-stake-external-rewards/Cargo.toml b/contracts/staking/cw20-stake-external-rewards/Cargo.toml
index 9f59c261e..f081eb63a 100644
--- a/contracts/staking/cw20-stake-external-rewards/Cargo.toml
+++ b/contracts/staking/cw20-stake-external-rewards/Cargo.toml
@@ -22,15 +22,16 @@ cw-storage-plus = { workspace = true }
 cw-controllers = { workspace = true }
 cw20 = { workspace = true }
 cw-utils = { workspace = true }
-cw20-base = {  workspace = true, features = ["library"] }
+cw20-base = { workspace = true, features = ["library"] }
 cw2 = { workspace = true }
 thiserror = { workspace = true }
-cw20-stake = { workspace = true, features = ["library"]}
+cw20-stake = { workspace = true, features = ["library"] }
 cw-ownable = { workspace = true }
 dao-hooks = { workspace = true }
 
 cw20-stake-external-rewards-v1 = { workspace = true }
 cw20-013 = { package = "cw20", version = "0.13" }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/contracts/staking/cw20-stake-external-rewards/src/msg.rs b/contracts/staking/cw20-stake-external-rewards/src/msg.rs
index eb873c798..e4bc3be81 100644
--- a/contracts/staking/cw20-stake-external-rewards/src/msg.rs
+++ b/contracts/staking/cw20-stake-external-rewards/src/msg.rs
@@ -22,6 +22,7 @@ pub struct InstantiateMsg {
 
 #[cw_ownable_execute]
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     StakeChangeHook(StakeChangedHookMsg),
     Claim {},
@@ -45,7 +46,7 @@ pub enum ReceiveMsg {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(InfoResponse)]
     Info {},
diff --git a/contracts/staking/cw20-stake-reward-distributor/Cargo.toml b/contracts/staking/cw20-stake-reward-distributor/Cargo.toml
index 75972d965..5ecfcd971 100644
--- a/contracts/staking/cw20-stake-reward-distributor/Cargo.toml
+++ b/contracts/staking/cw20-stake-reward-distributor/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 name = "cw20-stake-reward-distributor"
 edition = "2018"
-authors = ["Vernon Johnson <vtj2105@columbia.edu>, ekez <ekez@withoutdoing.com>"]
+authors = [
+    "Vernon Johnson <vtj2105@columbia.edu>, ekez <ekez@withoutdoing.com>",
+]
 description = "Distributes cw20 staking rewards."
 license = { workspace = true }
 repository = { workspace = true }
@@ -24,11 +26,12 @@ cw-storage-plus = { workspace = true }
 cw2 = { workspace = true }
 cw20 = { workspace = true }
 cw-utils = { workspace = true }
-cw20-base = {  workspace = true, features = ["library"] }
-cw20-stake = { workspace = true, features = ["library"]}
+cw20-base = { workspace = true, features = ["library"] }
+cw20-stake = { workspace = true, features = ["library"] }
 thiserror = { workspace = true }
 cw-ownable = { workspace = true }
 cw20-stake-reward-distributor-v1 = { workspace = true, features = ["library"] }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/contracts/staking/cw20-stake-reward-distributor/src/msg.rs b/contracts/staking/cw20-stake-reward-distributor/src/msg.rs
index 47e347086..a54ca3c5f 100644
--- a/contracts/staking/cw20-stake-reward-distributor/src/msg.rs
+++ b/contracts/staking/cw20-stake-reward-distributor/src/msg.rs
@@ -18,6 +18,7 @@ pub struct InstantiateMsg {
 
 #[cw_ownable_execute]
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     UpdateConfig {
         staking_addr: String,
@@ -29,7 +30,7 @@ pub enum ExecuteMsg {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(InfoResponse)]
     Info {},
diff --git a/contracts/staking/cw20-stake/Cargo.toml b/contracts/staking/cw20-stake/Cargo.toml
index 4417b372b..47cf154d0 100644
--- a/contracts/staking/cw20-stake/Cargo.toml
+++ b/contracts/staking/cw20-stake/Cargo.toml
@@ -23,7 +23,7 @@ cw-controllers = { workspace = true }
 cw-hooks = { workspace = true }
 cw20 = { workspace = true }
 cw-utils = { workspace = true }
-cw20-base = {  workspace = true, features = ["library"] }
+cw20-base = { workspace = true, features = ["library"] }
 cw2 = { workspace = true }
 thiserror = { workspace = true }
 cw-paginate-storage = { workspace = true }
@@ -33,6 +33,7 @@ dao-voting = { workspace = true }
 
 cw20-stake-v1 = { workspace = true, features = ["library"] }
 cw-utils-v1 = { workspace = true }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/contracts/staking/cw20-stake/src/msg.rs b/contracts/staking/cw20-stake/src/msg.rs
index bfe65466b..19dd36f71 100644
--- a/contracts/staking/cw20-stake/src/msg.rs
+++ b/contracts/staking/cw20-stake/src/msg.rs
@@ -21,6 +21,7 @@ pub struct InstantiateMsg {
 
 #[cw_ownable_execute]
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     Receive(Cw20ReceiveMsg),
     Unstake { amount: Uint128 },
@@ -37,7 +38,7 @@ pub enum ReceiveMsg {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(StakedBalanceAtHeightResponse)]
     StakedBalanceAtHeight {
diff --git a/contracts/test/dao-proposal-hook-counter/Cargo.toml b/contracts/test/dao-proposal-hook-counter/Cargo.toml
index 395fb338a..00606da08 100644
--- a/contracts/test/dao-proposal-hook-counter/Cargo.toml
+++ b/contracts/test/dao-proposal-hook-counter/Cargo.toml
@@ -23,7 +23,7 @@ cw-storage-plus = { workspace = true }
 cw2 = { workspace = true }
 thiserror = { workspace = true }
 dao-hooks = { workspace = true }
-
+cw-orch = { workspace = true }
 [dev-dependencies]
 cw-hooks = { workspace = true }
 cw20 = { workspace = true }
diff --git a/contracts/test/dao-proposal-hook-counter/src/msg.rs b/contracts/test/dao-proposal-hook-counter/src/msg.rs
index ad6048228..9a4a6f5e6 100644
--- a/contracts/test/dao-proposal-hook-counter/src/msg.rs
+++ b/contracts/test/dao-proposal-hook-counter/src/msg.rs
@@ -8,6 +8,7 @@ pub struct InstantiateMsg {
 }
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     ProposalHook(ProposalHookMsg),
     StakeChangeHook(StakeChangedHookMsg),
@@ -15,7 +16,7 @@ pub enum ExecuteMsg {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(Uint128)]
     StakeCounter {},
diff --git a/contracts/test/dao-proposal-sudo/Cargo.toml b/contracts/test/dao-proposal-sudo/Cargo.toml
index 87f102efc..cb4fa9f46 100644
--- a/contracts/test/dao-proposal-sudo/Cargo.toml
+++ b/contracts/test/dao-proposal-sudo/Cargo.toml
@@ -24,7 +24,7 @@ cw2 = { workspace = true }
 thiserror = { workspace = true }
 dao-dao-macros = { workspace = true }
 dao-interface = { workspace = true }
-cw-orch = "0.22.2"
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/contracts/test/dao-test-custom-factory/Cargo.toml b/contracts/test/dao-test-custom-factory/Cargo.toml
index 1c7a8cb5c..e25fe5a54 100644
--- a/contracts/test/dao-test-custom-factory/Cargo.toml
+++ b/contracts/test/dao-test-custom-factory/Cargo.toml
@@ -33,6 +33,6 @@ cw-tokenfactory-issuer = { workspace = true, features = [
   "library",
   "osmosis_tokenfactory",
 ] }
-
+cw-orch = { workspace = true }
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/contracts/test/dao-test-custom-factory/src/msg.rs b/contracts/test/dao-test-custom-factory/src/msg.rs
index 42128cd2e..7e875d0d8 100644
--- a/contracts/test/dao-test-custom-factory/src/msg.rs
+++ b/contracts/test/dao-test-custom-factory/src/msg.rs
@@ -7,6 +7,7 @@ use dao_interface::token::NewTokenInfo;
 pub struct InstantiateMsg {}
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg {
     /// Example NFT factory implementation
     NftFactory {
@@ -37,7 +38,7 @@ pub enum ExecuteMsg {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg {
     #[returns(dao_interface::voting::InfoResponse)]
     Info {},
diff --git a/contracts/test/dao-voting-cw20-balance/Cargo.toml b/contracts/test/dao-voting-cw20-balance/Cargo.toml
index 77e55bf88..f750ba315 100644
--- a/contracts/test/dao-voting-cw20-balance/Cargo.toml
+++ b/contracts/test/dao-voting-cw20-balance/Cargo.toml
@@ -26,8 +26,8 @@ cw-utils = { workspace = true }
 thiserror = { workspace = true }
 dao-dao-macros = { workspace = true }
 dao-interface = { workspace = true }
-cw20-base = {  workspace = true, features = ["library"] }
-cw-orch = "0.22.2"
+cw20-base = { workspace = true, features = ["library"] }
+cw-orch = { workspace = true }
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/packages/dao-interface/Cargo.toml b/packages/dao-interface/Cargo.toml
index 62252d894..6cf745ab2 100644
--- a/packages/dao-interface/Cargo.toml
+++ b/packages/dao-interface/Cargo.toml
@@ -15,7 +15,7 @@ cw20 = { workspace = true }
 cw721 = { workspace = true }
 cw-utils = { workspace = true }
 osmosis-std = { workspace = true }
-cw-orch = "0.22.2"
+cw-orch = {workspace = true}
 
 [dev-dependencies]
 cosmwasm-schema = { workspace = true }
diff --git a/packages/dao-pre-propose-base/Cargo.toml b/packages/dao-pre-propose-base/Cargo.toml
index 53beba053..f8f9e392f 100644
--- a/packages/dao-pre-propose-base/Cargo.toml
+++ b/packages/dao-pre-propose-base/Cargo.toml
@@ -34,6 +34,7 @@ semver = { workspace = true }
 cw-denom-v241 = { workspace = true }
 dao-pre-propose-base-v241 = { workspace = true }
 dao-voting-v241 = { workspace = true }
+cw-orch = {workspace = true}
 
 [dev-dependencies]
 cw-multi-test = { workspace = true }
diff --git a/packages/dao-pre-propose-base/src/msg.rs b/packages/dao-pre-propose-base/src/msg.rs
index 45dfe412d..cfdd8ea64 100644
--- a/packages/dao-pre-propose-base/src/msg.rs
+++ b/packages/dao-pre-propose-base/src/msg.rs
@@ -20,6 +20,7 @@ pub struct InstantiateMsg<InstantiateExt> {
 }
 
 #[cw_serde]
+#[derive(cw_orch::ExecuteFns)]
 pub enum ExecuteMsg<ProposalMessage, ExecuteExt> {
     /// Creates a new proposal in the pre-propose module. MSG will be
     /// serialized and used as the proposal creation message.
@@ -106,7 +107,7 @@ pub enum ExecuteMsg<ProposalMessage, ExecuteExt> {
 }
 
 #[cw_serde]
-#[derive(QueryResponses)]
+#[derive(QueryResponses, cw_orch::QueryFns)]
 pub enum QueryMsg<QueryExt>
 where
     QueryExt: JsonSchema,