diff --git a/README.md b/README.md
index a0f2905..77cf520 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-# Agora
+# Agora :classical_building:
+![integrate.yaml badge](https://github.com/Liqwid-Labs/agora/actions/workflows/integrate.yaml/badge.svg?branch=master)
 
 Agora is a set of Plutus scripts that compose together to form a governance system.
 
diff --git a/agora/Agora/Stake.hs b/agora/Agora/Stake.hs
index bb7f471..9ee7c3c 100644
--- a/agora/Agora/Stake.hs
+++ b/agora/Agora/Stake.hs
@@ -351,7 +351,7 @@ stakeValidator stake =
     txInfo' <- plet ctx.txInfo
     txInfo <- pletFields @'["mint", "inputs", "outputs"] txInfo'
 
-    -- Coercion is safe in that if coercion fails we crash hard.
+    -- TODO: Use PTryFrom
     let stakeRedeemer :: Term _ PStakeRedeemer
         stakeRedeemer = pfromData $ punsafeCoerce redeemer
         stakeDatum' :: Term _ PStakeDatum
diff --git a/agora/Agora/Treasury.hs b/agora/Agora/Treasury.hs
index 9cbf6da..71eee81 100644
--- a/agora/Agora/Treasury.hs
+++ b/agora/Agora/Treasury.hs
@@ -10,7 +10,7 @@ module Agora.Treasury (module Agora.Treasury) where
 
 import GHC.Generics qualified as GHC
 import Generics.SOP
-import Plutarch.Api.V1.Contexts (PScriptContext, PScriptPurpose (PMinting))
+import Plutarch.Api.V1.Contexts (PScriptPurpose (PMinting))
 import Plutarch.Api.V1.Value (PCurrencySymbol, PValue)
 import Plutarch.DataRepr (
   PDataFields,
@@ -23,19 +23,23 @@ import Plutus.V1.Ledger.Value (CurrencySymbol)
 
 import Agora.AuthorityToken (singleAuthorityTokenBurned)
 import Agora.Utils (passert)
+import Plutarch (popaque)
+import Plutarch.Api.V1 (PValidator)
+import Plutarch.Unsafe (punsafeCoerce)
 
 {- | Validator ensuring that transactions consuming the treasury
      do so in a valid manner.
 -}
-treasuryV ::
+treasuryValidator ::
   CurrencySymbol ->
-  ClosedTerm
-    ( PAsData PTreasuryDatum
-        :--> PAsData PTreasuryRedeemer
-        :--> PAsData PScriptContext
-        :--> PUnit
-    )
-treasuryV gatCs' = plam $ \_d r ctx' -> P.do
+  ClosedTerm PValidator
+treasuryValidator gatCs' = plam $ \datum redeemer ctx' -> P.do
+  -- TODO: Use PTryFrom
+  let treasuryRedeemer :: Term _ (PAsData PTreasuryRedeemer)
+      treasuryRedeemer = punsafeCoerce redeemer
+      _treasuryDatum' :: Term _ (PAsData PTreasuryDatum)
+      _treasuryDatum' = punsafeCoerce datum
+
   -- plet required fields from script context.
   ctx <- pletFields @["txInfo", "purpose"] ctx'
 
@@ -43,7 +47,7 @@ treasuryV gatCs' = plam $ \_d r ctx' -> P.do
   PMinting _ <- pmatch ctx.purpose
 
   -- Ensure redeemer type is valid.
-  PAlterTreasuryParams _ <- pmatch $ pfromData r
+  PAlterTreasuryParams _ <- pmatch $ pfromData treasuryRedeemer
 
   -- Get the minted value from txInfo.
   txInfo' <- plet ctx.txInfo
@@ -55,7 +59,7 @@ treasuryV gatCs' = plam $ \_d r ctx' -> P.do
 
   passert "singleAuthorityTokenBurned" $ singleAuthorityTokenBurned gatCs txInfo' mint
 
-  pconstant ()
+  popaque $ pconstant ()
 
 {- | Plutarch level type representing datum of the treasury.
      Contains: