diff --git a/src/components/ActiveTransaction.tsx b/src/components/ActiveTransaction.tsx
index e8c4df76b..ce4767f9e 100644
--- a/src/components/ActiveTransaction.tsx
+++ b/src/components/ActiveTransaction.tsx
@@ -23,20 +23,23 @@ const InfoBlock = ({
 }) => (
   <>
     {full ? (
-      <Box 
-        direction="column" 
-        align="center" 
-        justify="center" 
-        pad={{ vertical: 'large' }}
-      >
-        <Box gap='small'>
-          <Box direction="row" gap="medium" alignSelf='start'>
+      <Box direction="column" align="center" justify="center" pad={{ vertical: 'large' }}>
+        <Box gap="small">
+          <Box direction="row" gap="medium" alignSelf="start">
             {icon}
             <Text size="large"> {title}</Text>
           </Box>
-          <Box direction="row" gap="medium" fill='horizontal' alignContent='end'>
-            <Box fill align='end' ><Text size="small" weight='lighter'>{subTitle}</Text></Box>
-            {button && <Box flex={false} alignSelf="end">{button}</Box>}
+          <Box direction="row" gap="medium" fill="horizontal" alignContent="end">
+            <Box fill align="end">
+              <Text size="small" weight="lighter">
+                {subTitle}
+              </Text>
+            </Box>
+            {button && (
+              <Box flex={false} alignSelf="end">
+                {button}
+              </Box>
+            )}
           </Box>
         </Box>
       </Box>
@@ -47,8 +50,11 @@ const InfoBlock = ({
           <Box gap="xsmall">
             <Text size="medium">{title}</Text>
             <Box direction="row" gap="xsmall">
-
-            <Box fill align='end' ><Text size="small" weight='lighter'>{subTitle}</Text></Box>
+              <Box fill align="end">
+                <Text size="small" weight="lighter">
+                  {subTitle}
+                </Text>
+              </Box>
             </Box>
             <Box alignSelf="end">{button}</Box>
           </Box>
@@ -79,10 +85,10 @@ const ActiveTransaction = ({
   const activeProcess = txProcess;
 
   return (
-    <Box pad={pad ? { vertical: 'medium' } : undefined} align={full ? 'center': undefined } >
+    <Box pad={pad ? { vertical: 'medium' } : undefined} align={full ? 'center' : undefined}>
       {!full && (activeProcess?.stage === ProcessStage.PROCESS_INACTIVE || !activeProcess) && (
-        <Box justify="between" direction="row" pad="xsmall" >
-          <Text size="xsmall"> Review Transaction </Text>
+        <Box justify="between" direction="row" pad="xsmall">
+          <Text size="xsmall">Review Transaction</Text>
           {!full && <CancelButton action={cancelAction ? () => cancelAction() : () => null} />}
         </Box>
       )}
@@ -91,7 +97,8 @@ const ActiveTransaction = ({
         background={full ? undefined : 'gradient-transparent'}
         round="xsmall"
         pad={full ? { horizontal: 'large' } : 'small'}
-        height={full? undefined: { min:'100px' } }
+        height={full ? undefined : { min: '100px' }}
+        fill
       >
         {(activeProcess?.stage === ProcessStage.PROCESS_INACTIVE || !activeProcess) && (
           <>
diff --git a/src/components/Connect.tsx b/src/components/Connect.tsx
index 4d50cdc38..cfa0299b4 100644
--- a/src/components/Connect.tsx
+++ b/src/components/Connect.tsx
@@ -3,7 +3,7 @@ import { Box, ResponsiveContext, Text } from 'grommet';
 import { ChainContext } from '../contexts/ChainContext';
 import BackButton from './buttons/BackButton';
 import Disclaimer from './Disclaimer';
-import { SettingsContext } from '../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../contexts/SettingsContext';
 import { ISettingsContext } from '../types';
 import GeneralButton from './buttons/GeneralButton';
 import YieldMark from './logos/YieldMark';
@@ -69,10 +69,12 @@ const Connect = ({ setSettingsOpen, setConnectOpen }: any) => {
       </Box>
 
       {disclaimerChecked === false && (
-        <Disclaimer
-          checked={disclaimerChecked}
-          onChange={(event: any) => updateSetting('disclaimerChecked', event.target.checked)}
-        />
+        <Box border={{ color: 'brand' }} round="small" pad="medium">
+          <Disclaimer
+            checked={disclaimerChecked}
+            onChange={(event: any) => updateSetting(Settings.DISCLAIMER_CHECKED, event.target.checked)}
+          />
+        </Box>
       )}
       <Box pad="medium" gap={mobile ? 'large' : 'small'}>
         {[...CONNECTORS.keys()].map((name: string) => {
diff --git a/src/components/CurrencyToggle.tsx b/src/components/CurrencyToggle.tsx
index 628cc8ee3..6fcc308f5 100644
--- a/src/components/CurrencyToggle.tsx
+++ b/src/components/CurrencyToggle.tsx
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 import { Box, Text } from 'grommet';
-import { SettingsContext } from '../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../contexts/SettingsContext';
 import { ISettingsContext } from '../types';
 
 const CurrencyToggle = () => {
@@ -17,7 +17,7 @@ const CurrencyToggle = () => {
         // border={dashCurrency === 'USDC' ? undefined : { color: 'lightgrey' }}
         background={dashCurrency === 'USDC' ? 'gradient-transparent' : undefined}
         round={{ corner: 'left' }}
-        onClick={() => updateSetting('dashCurrency', 'USDC')}
+        onClick={() => updateSetting(Settings.DASH_CURRENCY, 'USDC')}
         align="center"
         justify="center"
         elevation={dashCurrency === 'USDC' ? 'xsmall' : 'small'}
@@ -30,7 +30,7 @@ const CurrencyToggle = () => {
         // border={dashCurrency === 'ETH' ? undefined : { color: 'lightgrey' }}
         background={dashCurrency === 'ETH' ? 'gradient-transparent' : undefined}
         round={{ corner: 'right' }}
-        onClick={() => updateSetting('dashCurrency', 'ETH')}
+        onClick={() => updateSetting(Settings.DASH_CURRENCY, 'ETH')}
         align="center"
         justify="center"
         elevation={dashCurrency === 'ETH' ? 'xsmall' : 'small'}
diff --git a/src/components/DashboardSettings.tsx b/src/components/DashboardSettings.tsx
index 009998950..6e0443b8b 100644
--- a/src/components/DashboardSettings.tsx
+++ b/src/components/DashboardSettings.tsx
@@ -2,7 +2,7 @@ import { useState, useContext } from 'react';
 import { Button, DropButton, Text, Box } from 'grommet';
 import { FiMoreVertical } from 'react-icons/fi';
 import { ActionType } from '../types';
-import { SettingsContext } from '../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../contexts/SettingsContext';
 
 const DashboardSettings = ({ actionType }: { actionType: string }) => {
   const {
@@ -18,7 +18,7 @@ const DashboardSettings = ({ actionType }: { actionType: string }) => {
         <Box gap="xxsmall">
           <Button
             onClick={() => {
-              updateSetting('dashHideEmptyVaults', !dashHideEmptyVaults);
+              updateSetting(Settings.DASH_HIDE_EMPTY_VAULTS, !dashHideEmptyVaults);
               setSettingsOpen(false);
             }}
             plain
diff --git a/src/components/YieldBalances.tsx b/src/components/YieldBalances.tsx
index f74fc75df..be47722d7 100644
--- a/src/components/YieldBalances.tsx
+++ b/src/components/YieldBalances.tsx
@@ -52,7 +52,7 @@ const Balances = () => {
   return (
     <Box pad="small" justify="center" align="start" gap="xsmall">
       <Balance image={selectedBase?.image} balance={baseBalance} loading={assetsLoading} />
-      {path === 'borrow' && selectedBase?.id !== selectedIlk?.id && selectedIlk?.idToUse !== WETH && (
+      {path === 'borrow' && selectedBase?.id !== selectedIlk?.id && selectedIlk?.proxyId !== WETH && (
         <Balance image={selectedIlk?.image} balance={ilkBalance} loading={assetsLoading} />
       )}
     </Box>
diff --git a/src/components/YieldSettings.tsx b/src/components/YieldSettings.tsx
index 100d47533..1242000fe 100644
--- a/src/components/YieldSettings.tsx
+++ b/src/components/YieldSettings.tsx
@@ -1,6 +1,6 @@
 import { useContext, useState } from 'react';
 import { Anchor, Box, Collapsible, ResponsiveContext, Text, Tip } from 'grommet';
-import { FiChevronUp, FiChevronDown, FiExternalLink, FiX } from 'react-icons/fi';
+import { FiChevronUp, FiChevronDown, FiExternalLink } from 'react-icons/fi';
 import { ChainContext } from '../contexts/ChainContext';
 import { abbreviateHash, clearCachedItems } from '../utils/appUtils';
 import YieldAvatar from './YieldAvatar';
@@ -14,6 +14,7 @@ import ApprovalSetting from './settings/ApprovalSetting';
 import ThemeSetting from './settings/ThemeSetting';
 import GeneralButton from './buttons/GeneralButton';
 import NetworkSetting from './settings/NetworkSetting';
+import UnwrapSetting from './settings/UnwrapSetting';
 import BackButton from './buttons/BackButton';
 
 const YieldSettings = ({ setSettingsOpen, setConnectOpen }: any) => {
@@ -56,12 +57,6 @@ const YieldSettings = ({ setSettingsOpen, setConnectOpen }: any) => {
       <Box gap="small" pad="medium" background="gradient-transparent" flex={false}>
         {mobile && <BackButton action={() => setSettingsOpen(false)} />}
 
-        {/* {!mobile && (
-          <Box fill='horizontal' style={{ position: 'absolute', top:'0px' }} >
-            <BackButton action={() => setSettingsOpen(false)} />
-          </Box>
-        )} */}
-
         {!mobile && (
           <Box gap="small" style={{ position: 'fixed' }} margin={{ left: '-60px', top: '10%' }} animation="slideLeft">
             <YieldAvatar address={account} size={7} />
@@ -126,6 +121,7 @@ const YieldSettings = ({ setSettingsOpen, setConnectOpen }: any) => {
       <Box pad="medium" gap="medium" flex={false}>
         <ThemeSetting />
         <ApprovalSetting />
+        <UnwrapSetting />
         <SlippageSetting />
       </Box>
 
diff --git a/src/components/buttons/BackButton.tsx b/src/components/buttons/BackButton.tsx
index 0e6c4d775..7fb9d6a9c 100644
--- a/src/components/buttons/BackButton.tsx
+++ b/src/components/buttons/BackButton.tsx
@@ -4,9 +4,9 @@ import { FiChevronLeft } from 'react-icons/fi';
 import styled from 'styled-components';
 
 const StyledButton = styled(Button)`
-  -webkit-transition: transform 0.3s ease-in-out;
-  -moz-transition: transform 0.3s ease-in-out;
-  transition: transform 0.3s ease-in-out;
+  -webkit-transition: transform 0.5s ease-in-out;
+  -moz-transition: transform 0.5s ease-in-out;
+  transition: transform 0.5s ease-in-out;
   padding: 0;
   :hover {
     transform: scale(1.25);
@@ -22,21 +22,18 @@ function BackButton({ action }: { action: () => void }) {
   return (
     <Box align="center" direction="row">
       <StyledButton
-      
         color="grey"
         onClick={() => action()}
         icon={
-          <Avatar 
-          onMouseEnter={() => setHover(true)}
-          onMouseLeave={() => setHover(false)}
-          
-          size="2em" 
-          pad="xsmall" 
-          elevation="xsmall"
-          
+          <Avatar
+            onMouseEnter={() => setHover(true)}
+            onMouseLeave={() => setHover(false)}
+            size="2em"
+            pad="xsmall"
+            elevation={hover ? 'small' : undefined}
           >
-            {hover && <Text size="0.5em" weight='lighter'> Back </Text>}
-            {!hover &&  <FiChevronLeft />}
+            {hover && <Text color='text' size="0.5em" weight='lighter'> Back </Text>}
+            {!hover &&   <Text color='text'><FiChevronLeft /> </Text>}
           </Avatar>
         }
       />
diff --git a/src/components/buttons/NextButton.tsx b/src/components/buttons/NextButton.tsx
index ae6fbbdae..fe3194b2e 100644
--- a/src/components/buttons/NextButton.tsx
+++ b/src/components/buttons/NextButton.tsx
@@ -4,24 +4,32 @@ import styled from 'styled-components';
 import { useColorScheme } from '../../hooks/useColorScheme';
 
 const StyledButton = styled(Button)`
-
   -webkit-transition: transform 0.2s ease-in-out;
   -moz-transition: transform 0.2s ease-in-out;
   transition: transform 0.2s ease-in-out;
 
   border: 2px solid transparent;
   border-radius: 100px;
-  
-  background: 
-  ${(props: any) => ( props.errorLabel 
+
+  background: ${(props: any) =>
+    props.errorLabel
       ? `linear-gradient(${props.background},${props.background}) padding-box, #F87171 border-box`
-      : `linear-gradient(${props.background}, ${props.background}) padding-box, -webkit-linear-gradient(135deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8, #1098ad, #07b39b, #6fba82) border-box`
-      )};
-  
+      : `linear-gradient(${props.background}, ${props.background}) padding-box, -webkit-linear-gradient(135deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8, #1098ad, #07b39b, #6fba82) border-box`};
+
   :hover:enabled {
     transform: scale(1.02);
     box-shadow: none;
-    background: -webkit-linear-gradient(135deg, #f7953380, #f3705580, #ef4e7b80, #a166ab80, #5073b880, #1098ad80, #07b39b80, #6fba8280);
+    background: -webkit-linear-gradient(
+      135deg,
+      #f7953380,
+      #f3705580,
+      #ef4e7b80,
+      #a166ab80,
+      #5073b880,
+      #1098ad80,
+      #07b39b80,
+      #6fba8280
+    );
   }
 
   :active:enabled {
@@ -32,54 +40,36 @@ const StyledButton = styled(Button)`
     transform: scale(0.9);
     opacity: ${(props: any) => (props.errorLabel ? '0.8 !important' : '0.2 !important')};
   }
-
 `;
 
-// ${(props: any) => ( 
-//   props.theme.dark  
-//   ? 'linear-gradient(135deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8, #1098ad, #07b39b, #6fba82) border-box' 
-//   : 'linear-gradient(135deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8, #1098ad, #07b39b, #6fba82) border-box'
-//   )};
-// border: 2px solid transparent;
-// border-radius: 100px;
-// :hover {
-//     transform: scale(1.02);
-//     border: 2px solid #ffffff00;
-// } 
-//   :disabled {
-//     box-shadow: none;
-//     opacity: ${(props: any) => (props.errorLabel ? '0.8 !important' : '0.2 !important')};
-//   }
-
 const NextButton = (props: any) => {
-
   const theme = useColorScheme();
 
   return (
-  <Box>
-    <StyledButton
-      {...props}
-      color={props.errorLabel ? 'red' : undefined}
-      background= { theme === 'dark' ? '#181818' : '#FEFEFE' }
-      label={
-        props.errorLabel ? (
-          <Box direction="row" gap="small" align="center" fill justify="center">
-            <Text color="red">
-              <FiAlertTriangle style={{ verticalAlign: 'middle' }} />
-            </Text>
-            <Text color="red" size="xsmall">
-              {props.errorLabel}
-            </Text>
-          </Box>
-        ) : (
-          <Box>
-          <Text color="text" > {props.label} </Text>
-          {/* <FiFastForward />  */}
-          </Box>
-        )
-      }
-    />
-  </Box>)
+    <Box>
+      <StyledButton
+        {...props}
+        color={props.errorLabel ? 'red' : undefined}
+        background={theme === 'dark' ? '#181818' : '#FEFEFE'}
+        label={
+          props.errorLabel ? (
+            <Box direction="row" gap="small" align="center" fill justify="center">
+              <Text color="red">
+                <FiAlertTriangle style={{ verticalAlign: 'middle' }} />
+              </Text>
+              <Text color="red" size="xsmall">
+                {props.errorLabel}
+              </Text>
+            </Box>
+          ) : (
+            <Box>
+              <Text color="text"> {props.label} </Text>
+            </Box>
+          )
+        }
+      />
+    </Box>
+  );
 };
 
 export default NextButton;
diff --git a/src/components/logos/3CRVMark.tsx b/src/components/logos/CVX3CRVMark.tsx
similarity index 94%
rename from src/components/logos/3CRVMark.tsx
rename to src/components/logos/CVX3CRVMark.tsx
index c79420672..e97e58fce 100644
--- a/src/components/logos/3CRVMark.tsx
+++ b/src/components/logos/CVX3CRVMark.tsx
@@ -26,7 +26,7 @@ const TinyNum = styled(Box)`
   color: black;
 `;
 
-const TriCRVCVXMark = () => {
+const CVX3CRVMark = () => {
   const { pathname } = useRouter();
   const isDash = pathname.includes('dashboard');
   const bottomStackSize = isDash ? '16px' : '24px';
@@ -45,4 +45,4 @@ const TriCRVCVXMark = () => {
   );
 };
 
-export default TriCRVCVXMark;
+export default CVX3CRVMark;
diff --git a/src/components/logos/WrappedTokenMark.tsx b/src/components/logos/WrappedTokenMark.tsx
new file mode 100644
index 000000000..6d4d274b4
--- /dev/null
+++ b/src/components/logos/WrappedTokenMark.tsx
@@ -0,0 +1,14 @@
+import React from 'react';
+import { Avatar, Box } from 'grommet';
+
+const WrappedTokenMark = ({ tokenMark }: any) => (
+  <Box direction="row" align="center">
+    <Avatar border={{ color: '#444444' }} size='xsmall' alignContent='center' pad='2px'>
+    {/* <Avatar border={{ color: '#444444' }} pad='2px'> */}
+     {tokenMark}
+    {/* </Avatar>  */}
+    </Avatar>
+  </Box>
+);
+
+export default WrappedTokenMark;
diff --git a/src/components/positionItems/LendItem.tsx b/src/components/positionItems/LendItem.tsx
index a01697b46..a6a004972 100644
--- a/src/components/positionItems/LendItem.tsx
+++ b/src/components/positionItems/LendItem.tsx
@@ -28,7 +28,7 @@ function LendItem({
   }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(UserContext) as IUserContext;
   const { fyTokenMarketValue } = useLendHelpers(series!, '0');
   const seriesBase: IAsset = assetMap.get(series.baseId)!;
-  const isSelectedBaseAndSeries = series.baseId === seriesBase.id && series.id === selectedSeries?.id;
+  const isSelectedBaseAndSeries = series.baseId === seriesBase.proxyId && series.id === selectedSeries?.id;
 
   const handleSelect = (_series: ISeries) => {
     userActions.setSelectedBase(selectedBase);
diff --git a/src/components/selectors/AssetSelector.tsx b/src/components/selectors/AssetSelector.tsx
index 33bead201..4297c210a 100644
--- a/src/components/selectors/AssetSelector.tsx
+++ b/src/components/selectors/AssetSelector.tsx
@@ -75,9 +75,9 @@ function AssetSelector({ selectCollateral, isModal }: IAssetSelectorProps) {
 
     const filteredOptions = selectCollateral
       ? opts
-          .filter((a) => a.id !== selectedBase?.id) // show all available collateral assets if the user is not connected except selectedBase
+          .filter((a) => a.proxyId !== selectedBase?.proxyId) // show all available collateral assets if the user is not connected except selectedBase
           .filter((a) => (a.limitToSeries?.length ? a.limitToSeries.includes(selectedSeries!.id) : true)) // if there is a limitToSeries list (length > 0 ) then only show asset if list has the seriesSelected.
-      : opts.filter((a) => a.isYieldBase).filter((a) => !IGNORE_BASE_ASSETS.includes(a.id));
+      : opts.filter((a) => a.isYieldBase).filter((a) => !IGNORE_BASE_ASSETS.includes(a.proxyId));
 
     const sortedOptions = selectCollateral
       ? filteredOptions.sort((a, b) => (a.balance.lt(b.balance) ? 1 : -1))
@@ -96,8 +96,8 @@ function AssetSelector({ selectCollateral, isModal }: IAssetSelectorProps) {
 
   /* make sure ilk (collateral) never matches baseId */
   useEffect(() => {
-    if (selectedIlk?.id === selectedBase?.id) {
-      const firstNotBaseIlk = options.find((asset: IAsset) => asset.id !== selectedIlk?.id);
+    if (selectedIlk?.proxyId === selectedBase?.proxyId) {
+      const firstNotBaseIlk = options.find((asset: IAsset) => asset.proxyId !== selectedIlk?.proxyId);
       setSelectedIlk(firstNotBaseIlk!);
     }
   }, [options, selectedIlk, selectedBase, setSelectedIlk]);
diff --git a/src/components/selectors/LendPositionSelector.tsx b/src/components/selectors/LendPositionSelector.tsx
index c7660d8d4..1afe3b2f8 100644
--- a/src/components/selectors/LendPositionSelector.tsx
+++ b/src/components/selectors/LendPositionSelector.tsx
@@ -34,7 +34,7 @@ function PositionSelector({ actionType }: { actionType: ActionType }) {
         /* filter by positive balances on either pool tokens or fyTokens */
         .filter((_series: ISeries) => (actionType === 'LEND' && _series ? _series.fyTokenBalance?.gt(ZERO_BN) : true))
         .filter((_series: ISeries) => (actionType === 'POOL' && _series ? _series.poolTokens?.gt(ZERO_BN) : true))
-        .filter((_series: ISeries) => (base ? _series.baseId === base.idToUse : true))
+        .filter((_series: ISeries) => (base ? _series.baseId === base.proxyId : true))
         .filter((_series: ISeries) => (series ? _series.id === series.id : true));
       setCurrentFilter({ base, series });
       setFilterLabels([base?.symbol, series?.displayNameMobile]);
diff --git a/src/components/selectors/NetworkSelector.tsx b/src/components/selectors/NetworkSelector.tsx
index 3a6ea7458..cf93d1bd8 100644
--- a/src/components/selectors/NetworkSelector.tsx
+++ b/src/components/selectors/NetworkSelector.tsx
@@ -77,7 +77,7 @@ const NetworkSelector = () => {
                 <ArbitrumLogo />
               </Box>
               <Text size="small" color={CHAIN_INFO.get(42161)?.colorSecondary}>
-                {[4, 42, 421611].includes(fallbackChainId!) ? CHAIN_INFO.get(fallbackChainId!)?.name : 'Arbitrum'}
+                {[4, 5, 42, 421611].includes(fallbackChainId!) ? CHAIN_INFO.get(fallbackChainId!)?.name : 'Arbitrum'}
               </Text>
             </Box>
           )
diff --git a/src/components/selectors/SeriesSelector.tsx b/src/components/selectors/SeriesSelector.tsx
index 088360caa..9da3d335d 100644
--- a/src/components/selectors/SeriesSelector.tsx
+++ b/src/components/selectors/SeriesSelector.tsx
@@ -169,9 +169,9 @@ function SeriesSelector({ selectSeriesLocally, inputValue, actionType, cardLayou
   useEffect(() => {
     const opts = Array.from(seriesMap.values());
 
-    /* filter out options based on base Id and if mature */
+    /* filter out options based on base Id ( or proxyId ) and if mature */
     let filteredOpts = opts.filter(
-      (_series) => _series.baseId === selectedBase?.idToUse && !_series.seriesIsMature
+      (_series) => _series.baseId === selectedBase?.proxyId && !_series.seriesIsMature
       // !ignoredSeries?.includes(_series.baseId)
     );
 
diff --git a/src/components/selectors/StrategySelector.tsx b/src/components/selectors/StrategySelector.tsx
index 4c871318a..cefe6f418 100644
--- a/src/components/selectors/StrategySelector.tsx
+++ b/src/components/selectors/StrategySelector.tsx
@@ -65,7 +65,7 @@ function StrategySelector({ inputValue, cardLayout, setOpen, open = false }: ISt
   useEffect(() => {
     const opts = Array.from(strategyMap.values()) as IStrategy[];
     const filteredOpts = opts
-      .filter((_st) => _st.baseId === selectedBase?.idToUse && !_st.currentSeries?.seriesIsMature)
+      .filter((_st) => _st.baseId === selectedBase?.proxyId && !_st.currentSeries?.seriesIsMature)
       .filter((_st) => _st.id !== selectedStrategy?.id)
       .sort((a, b) => a.currentSeries?.maturity! - b.currentSeries?.maturity!);
     setOptions(filteredOpts);
@@ -85,7 +85,7 @@ function StrategySelector({ inputValue, cardLayout, setOpen, open = false }: ISt
   /* Keeping options/selection fresh and valid: */
   useEffect(() => {
     const opts: IStrategy[] = Array.from(strategyMap.values()).filter(
-      (_st: IStrategy) => _st.baseId === selectedBase?.idToUse && !_st.currentSeries?.seriesIsMature
+      (_st: IStrategy) => _st.baseId === selectedBase?.proxyId && !_st.currentSeries?.seriesIsMature
     );
     const strategyWithBalance = opts.find((_st) => _st?.accountBalance?.gt(ZERO_BN));
     /* select strategy with existing balance */
diff --git a/src/components/selectors/VaultPositionSelector.tsx b/src/components/selectors/VaultPositionSelector.tsx
index 75879a2ab..e0a27d1bb 100644
--- a/src/components/selectors/VaultPositionSelector.tsx
+++ b/src/components/selectors/VaultPositionSelector.tsx
@@ -33,9 +33,9 @@ function VaultPositionSelector(target: any) {
     ({ base, series, ilk }: IVaultFilter) => {
       const _filteredVaults: IVault[] = Array.from(vaultMap.values())
         .filter((vault: IVault) => !dashHideInactiveVaults || vault.isActive)
-        .filter((vault: IVault) => (base ? vault.baseId === base.idToUse : true))
+        .filter((vault: IVault) => (base ? vault.baseId === base.proxyId : true))
         .filter((vault: IVault) => (series ? vault.seriesId === series.id : true))
-        .filter((vault: IVault) => (ilk ? vault.ilkId === ilk.idToUse : true))
+        .filter((vault: IVault) => (ilk ? vault.ilkId === ilk.proxyId : true))
         .filter((vault: IVault) => vault.baseId !== vault.ilkId)
         .sort((vaultA: IVault, vaultB: IVault) => (vaultA.art.lt(vaultB.art) ? 1 : -1));
       setFilter({ base, series, ilk });
diff --git a/src/components/settings/ApprovalSetting.tsx b/src/components/settings/ApprovalSetting.tsx
index ed7d8b419..e70f93f2f 100644
--- a/src/components/settings/ApprovalSetting.tsx
+++ b/src/components/settings/ApprovalSetting.tsx
@@ -2,7 +2,7 @@ import { useContext } from 'react';
 import { Box, Text } from 'grommet';
 import Switch from 'react-switch';
 import { ApprovalType } from '../../types';
-import { SettingsContext } from '../../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../../contexts/SettingsContext';
 import { ChainContext } from '../../contexts/ChainContext';
 
 const AdvancedSetting = () => {
@@ -18,7 +18,6 @@ const AdvancedSetting = () => {
   } = useContext(SettingsContext);
 
   return (
-    // <Box gap="small" pad={{ vertical: 'small' }} border={{ side: 'bottom', color: 'text-xweak' }}>
     <Box gap="small" pad={{ vertical: 'small' }}>
       <Box direction="row" justify="between">
         <Text size="small" color={connectionName === 'metamask' ? undefined : 'text-xweak'}>
@@ -32,7 +31,9 @@ const AdvancedSetting = () => {
           uncheckedIcon={false}
           checkedIcon={false}
           onChange={(val: boolean) =>
-            val ? updateSetting('approvalMethod', ApprovalType.TX) : updateSetting('approvalMethod', ApprovalType.SIG)
+            val
+              ? updateSetting(Settings.APPROVAL_METHOD, ApprovalType.TX)
+              : updateSetting(Settings.APPROVAL_METHOD, ApprovalType.SIG)
           }
           handleDiameter={20}
           borderRadius={20}
@@ -46,7 +47,7 @@ const AdvancedSetting = () => {
         </Text>
         <Switch
           checked={approveMax}
-          onChange={(val: boolean) => updateSetting('approveMax', val)}
+          onChange={(val: boolean) => updateSetting(Settings.APPROVAL_MAX, val)}
           width={55}
           offColor="#BFDBFE"
           onColor="#60A5FA"
diff --git a/src/components/settings/SlippageSetting.tsx b/src/components/settings/SlippageSetting.tsx
index f1bc2b250..58ca90545 100644
--- a/src/components/settings/SlippageSetting.tsx
+++ b/src/components/settings/SlippageSetting.tsx
@@ -2,7 +2,7 @@ import { useCallback, useContext, useEffect, useState } from 'react';
 import { Box, Grid, Text, TextInput } from 'grommet';
 import { FiPercent } from 'react-icons/fi';
 import { cleanValue } from '../../utils/appUtils';
-import { SettingsContext } from '../../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../../contexts/SettingsContext';
 import BoxWrap from '../wraps/BoxWrap';
 import { ISettingsContext } from '../../types';
 
@@ -27,17 +27,16 @@ const SlippageSetting = () => {
   /* Sets the slippage tolerance on input */
   useEffect(() => {
     const _slippageTolerance = validateInput(Number(cleanValue(input, 4)) / 100);
-    updateSetting('slippageTolerance', _slippageTolerance);
+    updateSetting(Settings.SLIPPAGE_TOLERANCE, _slippageTolerance);
   }, [input]); // purpose ignore updateSetting
 
   /* handle slection - clear input on slection of preset */
   const handlePresetChange = (slippage: number) => {
     setInput('');
-    updateSetting('slippageTolerance', slippage);
+    updateSetting(Settings.SLIPPAGE_TOLERANCE, slippage);
   };
 
   return (
-    // <Box gap="small" pad={{ vertical: 'small' }} border={{ side: 'bottom', color: 'text-xweak' }}>
     <Box gap="small" pad={{ vertical: 'small' }}>
       <Text size="small">Slippage Tolerance</Text>
       <Box direction="row" justify="between">
diff --git a/src/components/settings/ThemeSetting.tsx b/src/components/settings/ThemeSetting.tsx
index 22e0cc6e0..baa8b0a45 100644
--- a/src/components/settings/ThemeSetting.tsx
+++ b/src/components/settings/ThemeSetting.tsx
@@ -3,7 +3,7 @@ import Switch from 'react-switch';
 
 import { Box, Text } from 'grommet';
 import { FiMoon, FiSun } from 'react-icons/fi';
-import { SettingsContext } from '../../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../../contexts/SettingsContext';
 
 const ThemeSettings = () => {
   const {
@@ -12,7 +12,6 @@ const ThemeSettings = () => {
   } = useContext(SettingsContext);
 
   return (
-    // <Box gap="small" pad={{ vertical: 'small' }} border={{ side: 'bottom', color: 'text-xweak' }}>
     <Box gap="small" pad={{ vertical: 'small' }}>
       <Box direction="row" justify="between">
         <Text size="small">Use System Color Theme</Text>
@@ -31,7 +30,7 @@ const ThemeSettings = () => {
           }
           offColor="#BFDBFE"
           onColor="#60A5FA"
-          onChange={(val: boolean) => updateSetting('autoTheme', val)}
+          onChange={(val: boolean) => updateSetting(Settings.AUTO_THEME, val)}
           handleDiameter={20}
           borderRadius={20}
         />
@@ -64,7 +63,7 @@ const ThemeSettings = () => {
           }
           offColor="#BFDBFE"
           onColor="#60A5FA"
-          onChange={(val: boolean) => updateSetting('darkMode', val)}
+          onChange={(val: boolean) => updateSetting(Settings.DARK_MODE, val)}
           handleDiameter={20}
           borderRadius={20}
           disabled={autoTheme}
diff --git a/src/components/settings/UnwrapSetting.tsx b/src/components/settings/UnwrapSetting.tsx
new file mode 100644
index 000000000..b19db059f
--- /dev/null
+++ b/src/components/settings/UnwrapSetting.tsx
@@ -0,0 +1,35 @@
+import { useContext } from 'react';
+import { Box, Text } from 'grommet';
+import Switch from 'react-switch';
+import { Settings, SettingsContext } from '../../contexts/SettingsContext';
+
+const UnwrapSetting = () => {
+  const {
+    settingsState: { unwrapTokens },
+    settingsActions: { updateSetting },
+  } = useContext(SettingsContext);
+
+  return (
+    <Box gap="small" pad={{ vertical: 'small' }}>
+      <Box direction="row" justify="between">
+        <Text size="small" color="text-xweak">
+          Auto-unwrap tokens
+        </Text>
+        <Switch
+          disabled
+          width={55}
+          checked={unwrapTokens}
+          offColor="#BFDBFE"
+          onColor="#60A5FA"
+          uncheckedIcon={false}
+          checkedIcon={false}
+          onChange={(val: boolean) => updateSetting(Settings.UNWRAP_TOKENS, val)}
+          handleDiameter={20}
+          borderRadius={20}
+        />
+      </Box>
+    </Box>
+  );
+};
+
+export default UnwrapSetting;
diff --git a/src/components/views/Borrow.tsx b/src/components/views/Borrow.tsx
index 02ff67139..124c81776 100644
--- a/src/components/views/Borrow.tsx
+++ b/src/components/views/Borrow.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useContext, useEffect, useState } from 'react';
-import { Box, CheckBox, Keyboard, ResponsiveContext, Stack, Text, TextInput } from 'grommet';
+import { Box, CheckBox, Keyboard, ResponsiveContext, Text, TextInput } from 'grommet';
 
 import { FiClock, FiPocket, FiPercent, FiTrendingUp } from 'react-icons/fi';
 
@@ -13,16 +13,7 @@ import SectionWrap from '../wraps/SectionWrap';
 import MaxButton from '../buttons/MaxButton';
 
 import { UserContext } from '../../contexts/UserContext';
-import {
-  ActionCodes,
-  ActionType,
-  ISettingsContext,
-  IUserContext,
-  IUserContextState,
-  IVault,
-  ProcessStage,
-  TxState,
-} from '../../types';
+import { ActionCodes, ActionType, IUserContext, IUserContextState, IVault, ProcessStage, TxState } from '../../types';
 import PanelWrap from '../wraps/PanelWrap';
 import CenterPanelWrap from '../wraps/CenterPanelWrap';
 import VaultSelector from '../selectors/VaultPositionSelector';
@@ -54,7 +45,6 @@ import DummyVaultItem from '../positionItems/DummyVaultItem';
 import SeriesOrStrategySelectorModal from '../selectors/SeriesOrStrategySelectorModal';
 import YieldNavigation from '../YieldNavigation';
 import VaultItem from '../positionItems/VaultItem';
-import { SettingsContext } from '../../contexts/SettingsContext';
 import { useAssetPair } from '../../hooks/useAssetPair';
 import Line from '../elements/Line';
 
@@ -74,10 +64,6 @@ const Borrow = () => {
   const { activeAccount, assetMap, vaultMap, seriesMap, selectedSeries, selectedIlk, selectedBase } = userState;
   const { setSelectedIlk } = userActions;
 
-  const {
-    settingsState: { diagnostics },
-  } = useContext(SettingsContext) as ISettingsContext;
-
   /* LOCAL STATE */
   const [modalOpen, toggleModal] = useState<boolean>(false);
   const [stepPosition, setStepPosition] = useState<number>(0);
@@ -199,7 +185,7 @@ const Borrow = () => {
     selectedSeries?.seriesIsMature ||
     (stepPosition === 1 && undercollateralized) ||
     (stepPosition === 1 && collatInputError) ||
-    selectedSeries.baseId !== selectedBase?.id
+    selectedSeries.baseId !== selectedBase?.proxyId
       ? setStepDisabled(true)
       : setStepDisabled(false); /* else if all pass, then unlock borrowing */
   }, [
@@ -211,7 +197,7 @@ const Borrow = () => {
     collatInput,
     undercollateralized,
     collatInputError,
-    selectedBase?.id,
+    selectedBase?.proxyId,
   ]);
 
   /* CHECK the list of current vaults which match the current series/ilk selection */ // TODO look at moving this to helper hook?
@@ -220,8 +206,8 @@ const Borrow = () => {
       const arr: IVault[] = Array.from(vaultMap.values()) as IVault[];
       const _matchingVaults = arr.filter(
         (v: IVault) =>
-          v.ilkId === selectedIlk.idToUse &&
-          v.baseId === selectedBase.idToUse &&
+          v.ilkId === selectedIlk.proxyId &&
+          v.baseId === selectedBase.proxyId &&
           v.seriesId === selectedSeries.id &&
           v.isActive
       );
@@ -340,7 +326,7 @@ const Borrow = () => {
                   <BackButton action={() => setStepPosition(0)} />
                 </Box> */}
                 <Box background="gradient-transparent" round={{ corner: 'top', size: 'xsmall' }} pad="medium">
-                <BackButton action={() => setStepPosition(0)} />
+                  <BackButton action={() => setStepPosition(0)} />
                   <Box pad="medium" direction="row" justify="between" round="small">
                     <Box justify="center">
                       <Gauge
@@ -516,8 +502,6 @@ const Borrow = () => {
                     </Box>
                   </ActiveTransaction>
                 </Box>
-
-                <Box></Box>
                 <Line />
               </>
             )}
@@ -544,12 +528,11 @@ const Borrow = () => {
                     <Text size="xsmall" weight="lighter">
                       I understand the risks associated with borrowing. In particular, I understand that as a new
                       protocol, Yield Protocol's liquidation auctions are not always competitive and if my vault falls
-                      below the minimum collateralization requirement ({' '}
+                      below the minimum collateralization requirement (
                       <Text size="xsmall" color="red">
-                        {' '}
                         {minCollatRatioPct}%
-                      </Text>{' '}
-                      ) I could lose most or all of my posted collateral.
+                      </Text>
+                      ), I could lose most or all of my posted collateral.
                     </Text>
                   }
                   checked={disclaimerChecked}
@@ -565,7 +548,7 @@ const Borrow = () => {
                 // label={<Text size={mobile ? 'small' : undefined}> Next step </Text>}
                 label={
                   <Text size={mobile ? 'small' : undefined}>
-                    {borrowInput && (!selectedSeries || selectedBase?.id !== selectedSeries.baseId)
+                    {borrowInput && (!selectedSeries || selectedBase?.proxyId !== selectedSeries.baseId)
                       ? `Select a ${selectedBase?.displaySymbol}${selectedBase && '-based'} Maturity`
                       : 'Next Step'}
                   </Text>
diff --git a/src/components/views/Dashboard.tsx b/src/components/views/Dashboard.tsx
index c0cc450d8..173383316 100644
--- a/src/components/views/Dashboard.tsx
+++ b/src/components/views/Dashboard.tsx
@@ -11,7 +11,7 @@ import PanelWrap from '../wraps/PanelWrap';
 
 import DashboardPositionList from '../DashboardPositionList';
 import CurrencyToggle from '../CurrencyToggle';
-import { SettingsContext } from '../../contexts/SettingsContext';
+import { Settings, SettingsContext } from '../../contexts/SettingsContext';
 import { useDashboardHelpers } from '../../hooks/viewHelperHooks/useDashboardHelpers';
 import { UserContext } from '../../contexts/UserContext';
 import { formatValue } from '../../utils/appUtils';
@@ -70,7 +70,7 @@ const Dashboard = () => {
             <Box gap="medium">
               <Box justify="between" direction="row" align="center">
                 <Text size="medium">Vaults</Text>
-                <Box onClick={() => updateSetting('dashHideVaults', !dashHideVaults)} pad="xsmall">
+                <Box onClick={() => updateSetting(Settings.DASH_HIDE_VAULTS, !dashHideVaults)} pad="xsmall">
                   {dashHideVaults ? (
                     <Text size="xsmall" color="text-weak">
                       show vaults
@@ -98,7 +98,7 @@ const Dashboard = () => {
             <Box gap="medium">
               <Box justify="between" direction="row" align="center">
                 <Text size="medium">Lend Positions</Text>
-                <Box onClick={() => updateSetting('dashHideLendPositions', !dashHideLendPositions)} pad="xsmall">
+                <Box onClick={() => updateSetting(Settings.DASH_HIDE_LEND_POSITIONS, !dashHideLendPositions)} pad="xsmall">
                   {dashHideLendPositions ? (
                     <Text size="xsmall" color="text-weak">
                       show positions
@@ -126,7 +126,7 @@ const Dashboard = () => {
             <Box gap="medium">
               <Box justify="between" direction="row" align="center">
                 <Text size="medium">Liquidity </Text>
-                <Box onClick={() => updateSetting('dashHidePoolPositions', !dashHidePoolPositions)} pad="xsmall">
+                <Box onClick={() => updateSetting(Settings.DASH_HIDE_POOL_POSITIONS, !dashHidePoolPositions)} pad="xsmall">
                   {dashHidePoolPositions ? (
                     <Text size="xsmall" color="text-weak">
                       show positions
diff --git a/src/components/views/LendPosition.tsx b/src/components/views/LendPosition.tsx
index 2181ee267..279d978f7 100644
--- a/src/components/views/LendPosition.tsx
+++ b/src/components/views/LendPosition.tsx
@@ -211,7 +211,11 @@ const LendPosition = () => {
                               selectedBase?.digitFormat!
                             )} ${selectedBase?.displaySymbol!}`
                       }
-                      icon={<Logo image={selectedBase.image} />}
+                      icon={
+                        <Box height="1em" width="1em">
+                          <Logo image={selectedBase.image} />
+                        </Box>
+                      }
                       loading={seriesLoading}
                     />
                   </Box>
diff --git a/src/components/views/VaultPosition.tsx b/src/components/views/VaultPosition.tsx
index 387dfee4c..cf0e96e7c 100644
--- a/src/components/views/VaultPosition.tsx
+++ b/src/components/views/VaultPosition.tsx
@@ -273,7 +273,9 @@ const VaultPosition = () => {
     const _series = seriesMap.get(_selectedVault?.seriesId!) || null;
     const _base = assetMap.get(_selectedVault?.baseId!) || null;
     const _ilk = assetMap.get(_selectedVault?.ilkId!) || null;
-    const _ilkToUse = _ilk?.isWrappedToken && _ilk.unwrappedTokenId ? assetMap.get(_ilk.unwrappedTokenId) : _ilk; // use the unwrapped token if applicable
+    
+    // handle using ilk 
+    const _ilkToUse = _ilk; // use the unwrapped token if applicable
 
     _selectedVault && setSelectedSeries(_series);
     _selectedVault && setSelectedBase(_base);
diff --git a/src/components/wraps/ActionButtonWrap.tsx b/src/components/wraps/ActionButtonWrap.tsx
index 02083df6c..057fb4727 100644
--- a/src/components/wraps/ActionButtonWrap.tsx
+++ b/src/components/wraps/ActionButtonWrap.tsx
@@ -3,20 +3,50 @@ import styled from 'styled-components';
 import { Button, Box, Text, Layer, ResponsiveContext } from 'grommet';
 import { ChainContext } from '../../contexts/ChainContext';
 import SidebarSettings from '../Sidebar';
+import { useColorScheme } from '../../hooks/useColorScheme';
 
-const StyledButton = styled(Button)`
+const StyledButton: any = styled(Button)`
+  -webkit-transition: transform 0.2s ease-in-out;
+  -moz-transition: transform 0.2s ease-in-out;
+  transition: transform 0.2s ease-in-out;
+
+  border: 2px solid transparent;
   border-radius: 100px;
-  :hover {
-    box-shadow: 0px 0px 0px 1px;
+
+  background: ${(props: any) =>
+    props.errorLabel
+      ? `linear-gradient(${props.background},${props.background}) padding-box, #F87171 border-box`
+      : `linear-gradient(${props.background}, ${props.background}) padding-box, -webkit-linear-gradient(135deg, #f79533, #f37055, #ef4e7b, #a166ab, #5073b8, #1098ad, #07b39b, #6fba82) border-box`};
+
+  :hover:enabled {
+    transform: scale(1.02);
+    box-shadow: none;
+    background: -webkit-linear-gradient(
+      135deg,
+      #f7953380,
+      #f3705580,
+      #ef4e7b80,
+      #a166ab80,
+      #5073b880,
+      #1098ad80,
+      #07b39b80,
+      #6fba8280
+    );
   }
+
+  :active:enabled {
+    transform: scale(1);
+  }
+
   :disabled {
-    box-shadow: none;
+    transform: scale(0.9);
     opacity: ${(props: any) => (props.errorLabel ? '0.8 !important' : '0.2 !important')};
   }
 `;
 
 function ActionButtonWrap({ children, pad }: { children: any; pad?: boolean }) {
   const mobile: boolean = useContext<any>(ResponsiveContext) === 'small';
+  const theme = useColorScheme();
 
   const {
     chainState: {
@@ -45,8 +75,13 @@ function ActionButtonWrap({ children, pad }: { children: any; pad?: boolean }) {
           children
         ) : (
           <StyledButton
+            background={theme === 'dark' ? '#181818' : '#FEFEFE'}
             secondary
-            label={<Text size={mobile ? 'small' : undefined}>Connect Wallet</Text>}
+            label={
+              <Text size={mobile ? 'small' : undefined} color="text">
+                Connect Wallet
+              </Text>
+            }
             onClick={() => setConnectOpen(true)}
           />
         )}
diff --git a/src/config/assets.ts b/src/config/assets.ts
index bfd21683d..31d936f0b 100644
--- a/src/config/assets.ts
+++ b/src/config/assets.ts
@@ -27,56 +27,26 @@ export const FUSDC2209 = '0x313700000000';
 
 /* Convex Curve LP token assets */
 export const CVX3CRV = '0x313900000000';
-export const CONVEX_BASED_ASSETS = ['CVX3CRV', CVX3CRV, 'CVX3CRV MOCK', 'Curve.fi DAI/USDC/USDT Convex Deposit Mock'];
 
-export const ETH_BASED_ASSETS = ['WETH', 'ETH', WETH];
-export const IGNORE_BASE_ASSETS = ['ENS'];
-
-export const DAI_PERMIT_ASSETS = ['DAI', DAI];
-export const NON_PERMIT_ASSETS = [
-  'WBTC',
-  'LINK',
-  WBTC,
-  LINK,
-  'ETH',
-  'WETH',
-  WETH,
-  yvUSDC,
-  'yvUSDC',
-  FDAI2203,
-  'FDAI2203',
-  FUSDC2203,
-  'FUSDC2203',
-  FDAI2206,
-  'FDAI2206',
-  FUSDC2206,
-  'FUSDC2206',
-  FUSDC2209,
-  'FUSDC2209',
-  FDAI2209,
-  'FDAI2209',
-  'fDAI2203',
-  'fUSDC2203',
-  'fDAI2206',
-  'fUSDC2206',
-  'fUSDC2209',
-  'fDAI2209',
-  CVX3CRV,
+export const CONVEX_BASED_ASSETS = [
   'CVX3CRV',
-  'Cvx3Crv Mock',
-  FRAX,
-  'FRAX',
+  CVX3CRV,
+  'CVX3CRV MOCK',
+  'Curve.fi DAI/USDC/USDT Convex Deposit Mock',
+  'cvx3Crv',
 ];
+export const ETH_BASED_ASSETS = ['WETH', 'ETH', WETH];
+export const IGNORE_BASE_ASSETS = ['ENS'];
 
 export const ASSET_INFO = new Map<string, IAssetInfo>();
 
+/* Unknown token for temporarily handling new tokens added */
 ASSET_INFO.set(UNKNOWN, {
   version: '1',
   name: 'UNKNOWN',
   decimals: 18,
   symbol: 'UNKNOWN',
   showToken: false,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_,
 });
@@ -87,7 +57,6 @@ ASSET_INFO.set(DAI, {
   decimals: 18,
   symbol: 'DAI',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_DaiPermit,
 });
@@ -98,7 +67,6 @@ ASSET_INFO.set(USDC, {
   decimals: 18,
   symbol: 'USDC',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_Permit,
 });
@@ -109,7 +77,6 @@ ASSET_INFO.set(WBTC, {
   decimals: 18,
   symbol: 'WBTC',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 6,
   tokenType: TokenType.ERC20_,
 });
@@ -120,7 +87,6 @@ ASSET_INFO.set(ENS, {
   decimals: 18,
   symbol: 'ENS',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_Permit,
 });
@@ -132,7 +98,6 @@ ASSET_INFO.set(WETH, {
   symbol: 'WETH',
   displaySymbol: 'ETH',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 6,
   tokenType: TokenType.ERC20_,
 });
@@ -144,12 +109,14 @@ ASSET_INFO.set(wstETH, {
   symbol: 'wstETH',
   displaySymbol: 'wstETH',
   showToken: true,
-  isWrappedToken: true,
-  wrappedTokenId: '',
-  wrappedTokenAddress: '',
   digitFormat: 6,
-  unwrappedTokenId: '0x303500000000',
   tokenType: TokenType.ERC20_Permit,
+  wrapHandlerAddresses: new Map([]),
+  unwrapHandlerAddresses: new Map([
+    [1, '0x491aB93faa921C8E634F891F96512Be14fD3DbB1'],
+    [4, '0x64BA0F1D2E5479BF132936328e8c533c95646fE8'],
+    [5, '0x9f65A6c2b2F12117573323443C8C2290f4C1e675'],
+  ]),
 });
 
 ASSET_INFO.set(stETH, {
@@ -158,13 +125,15 @@ ASSET_INFO.set(stETH, {
   decimals: 18,
   symbol: 'stETH',
   showToken: false,
-  isWrappedToken: false,
-  wrapHandlerAddress: '0x491aB93faa921C8E634F891F96512Be14fD3DbB1',
-  wrappedTokenId: '0x303400000000',
-  wrappedTokenAddress: '0xB12C63eD91e901995E68023293AC1A308ffA6c3c',
   digitFormat: 6,
-  unwrappedTokenId: '0x303500000000',
   tokenType: TokenType.ERC20_Permit,
+  wrapHandlerAddresses: new Map([
+    [1, '0x491aB93faa921C8E634F891F96512Be14fD3DbB1'],
+    [4, '0x64BA0F1D2E5479BF132936328e8c533c95646fE8'],
+    [5, '0x9f65A6c2b2F12117573323443C8C2290f4C1e675'],
+  ]),
+  unwrapHandlerAddresses: new Map([]),
+  proxyId: wstETH,
 });
 
 ASSET_INFO.set(LINK, {
@@ -173,7 +142,6 @@ ASSET_INFO.set(LINK, {
   decimals: 18,
   symbol: 'LINK',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_,
 });
@@ -184,7 +152,6 @@ ASSET_INFO.set(yvUSDC, {
   decimals: 18,
   symbol: 'yvUSDC',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_,
   limitToSeries: ['0x303230350000', '0x303230360000', '0x303230370000'],
@@ -196,7 +163,6 @@ ASSET_INFO.set(UNI, {
   decimals: 18,
   symbol: 'UNI',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 4,
   tokenType: TokenType.ERC20_Permit,
 });
@@ -207,7 +173,6 @@ ASSET_INFO.set(MKR, {
   decimals: 18,
   symbol: 'MKR',
   showToken: false,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_MKR,
 });
@@ -218,7 +183,6 @@ ASSET_INFO.set(FDAI2203, {
   decimals: 8,
   symbol: 'FDAI2203',
   showToken: false,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 563371972493313,
@@ -231,7 +195,6 @@ ASSET_INFO.set(FUSDC2203, {
   decimals: 8,
   symbol: 'FUSDC2203',
   showToken: false,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 844846949203969,
@@ -244,7 +207,6 @@ ASSET_INFO.set(FDAI2206, {
   decimals: 8,
   symbol: 'FDAI2206',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 563373963149313,
@@ -257,7 +219,6 @@ ASSET_INFO.set(FUSDC2206, {
   decimals: 8,
   symbol: 'FUSDC2206',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 844848939859969,
@@ -270,7 +231,6 @@ ASSET_INFO.set(FDAI2209, {
   decimals: 8,
   symbol: 'FDAI2209',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 563375953805313,
@@ -283,7 +243,6 @@ ASSET_INFO.set(FUSDC2209, {
   decimals: 8,
   symbol: 'FUSDC2209',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC1155_,
   tokenIdentifier: 844850930515969,
@@ -296,7 +255,6 @@ ASSET_INFO.set(CVX3CRV, {
   decimals: 18,
   symbol: 'cvx3crv',
   showToken: false,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_,
   limitToSeries: [
@@ -313,7 +271,6 @@ ASSET_INFO.set(FRAX, {
   decimals: 18,
   symbol: 'FRAX',
   showToken: true,
-  isWrappedToken: false,
   digitFormat: 2,
   tokenType: TokenType.ERC20_,
   limitToSeries: [],
diff --git a/src/config/chainData.ts b/src/config/chainData.ts
index d01ab7934..2c76edc09 100644
--- a/src/config/chainData.ts
+++ b/src/config/chainData.ts
@@ -13,9 +13,6 @@ export const SUPPORTED_RPC_URLS: { [chainId: number]: string } = {
   1: RPC_URLS[1],
   4: RPC_URLS[4],
   5: RPC_URLS[5],
-  42: RPC_URLS[42],
-  // 10: RPC_URLS[10],
-  // 69: RPC_URLS[69],
   42161: RPC_URLS[42161],
   421611: RPC_URLS[421611],
 };
diff --git a/src/config/marks.tsx b/src/config/marks.tsx
index 36648ce39..a62b71fec 100644
--- a/src/config/marks.tsx
+++ b/src/config/marks.tsx
@@ -1,4 +1,4 @@
-import TriCRVCVXMark from '../components/logos/3CRVMark';
+import CVX3CRVMark from '../components/logos/CVX3CRVMark';
 import DaiMark from '../components/logos/DaiMark';
 import ENSMark from '../components/logos/ENSMark';
 import EthMark from '../components/logos/EthMark';
@@ -29,7 +29,8 @@ const markMap = new Map([
   ['yvUSDC', <YVUSDCMark key="yvusdc" />],
   ['MKR', <MakerMark key="mkr" />],
   ['Notional', <NotionalMark key="notional" />],
-  ['Cvx3Crv Mock', <TriCRVCVXMark key="cvx3crv" />],
+  ['Cvx3Crv Mock', <CVX3CRVMark key="cvx3crv mock" />],
+  ['cvx3Crv', <CVX3CRVMark key="cvx3crv" />],
   ['FRAX', <FRAXMark key="frax" />],
 ]);
 
diff --git a/src/config/oracles.ts b/src/config/oracles.ts
index 3922ed9e3..49a115ec7 100644
--- a/src/config/oracles.ts
+++ b/src/config/oracles.ts
@@ -32,6 +32,7 @@ export const ORACLE_INFO = new Map<number, Map<string, Map<string, string>>>();
 // map asset (quote) and other asset (base) to a specific oracle based on where there is relevant price info for the pair
 export const CHAIN_ID_1_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
 export const CHAIN_ID_4_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
+export const CHAIN_ID_5_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
 export const CHAIN_ID_42_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
 export const CHAIN_ID_42161_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
 export const CHAIN_ID_421611_ASSET_ORACLE_INFO = new Map<string, Map<string, string>>();
diff --git a/src/contexts/ChainContext.tsx b/src/contexts/ChainContext.tsx
index b2482a5f4..014e75f27 100644
--- a/src/contexts/ChainContext.tsx
+++ b/src/contexts/ChainContext.tsx
@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
 import { BigNumber, Contract, ethers } from 'ethers';
-
 import { format } from 'date-fns';
 
 import { useCachedState } from '../hooks/generalHooks';
@@ -8,13 +7,15 @@ import { useConnection } from '../hooks/useConnection';
 
 import yieldEnv from './yieldEnv.json';
 import * as contracts from '../contracts';
-import { IAssetRoot, IChainContextState, ISeriesRoot, IStrategyRoot, TokenType } from '../types';
+import { IAssetInfo, IAssetRoot, IChainContextState, ISeriesRoot, IStrategyRoot, TokenType } from '../types';
 import { ASSET_INFO, ETH_BASED_ASSETS, UNKNOWN } from '../config/assets';
+
 import { nameFromMaturity, getSeason, SeasonType, clearCachedItems } from '../utils/appUtils';
 
 import { ethereumColorMap, arbitrumColorMap } from '../config/colors';
 import { AssetAddedEvent, SeriesAddedEvent } from '../contracts/Cauldron';
 import { JoinAddedEvent, PoolAddedEvent } from '../contracts/Ladle';
+
 import markMap from '../config/marks';
 import YieldMark from '../components/logos/YieldMark';
 
@@ -135,16 +136,14 @@ const ChainProvider = ({ children }: any) => {
       let CompositeMultiOracle: contracts.CompositeMultiOracle;
       let YearnVaultMultiOracle: contracts.YearnVaultMultiOracle;
       let Witch: contracts.Witch;
-      let LidoWrapHandler: contracts.LidoWrapHandler;
 
       // modules
       let WrapEtherModule: contracts.WrapEtherModule;
-      
 
       // Notional
       let NotionalMultiOracle: contracts.NotionalMultiOracle;
 
-      // Convex 
+      // Convex
       let ConvexLadleModule: contracts.ConvexLadleModule;
 
       // arbitrum specific
@@ -158,12 +157,11 @@ const ChainProvider = ({ children }: any) => {
 
         // module access
         WrapEtherModule = contracts.WrapEtherModule__factory.connect(addrs.WrapEtherModule, fallbackProvider);
-        
-        if ([1, 4, 5, 42].includes(fallbackChainId)) {
 
+        if ([1, 4, 5, 42].includes(fallbackChainId)) {
           ConvexLadleModule = contracts.ConvexLadleModule__factory.connect(addrs.ConvexLadleModule, fallbackProvider);
           RateOracle = contracts.CompoundMultiOracle__factory.connect(addrs.CompoundMultiOracle, fallbackProvider);
-          
+
           ChainlinkMultiOracle = contracts.ChainlinkMultiOracle__factory.connect(
             addrs.ChainlinkMultiOracle,
             fallbackProvider
@@ -196,7 +194,7 @@ const ChainProvider = ({ children }: any) => {
           RateOracle = AccumulatorOracle;
         }
       } catch (e) {
-        console.log('Could not connect to contracts: ', e,);
+        console.log('Could not connect to contracts: ', e);
       }
 
       if (
@@ -223,7 +221,6 @@ const ChainProvider = ({ children }: any) => {
       newContractMap.set('YearnVaultMultiOracle', YearnVaultMultiOracle);
       newContractMap.set('ChainlinkUSDOracle', ChainlinkUSDOracle);
       newContractMap.set('AccumulatorOracle', AccumulatorOracle);
-      newContractMap.set('LidoWrapHandler', LidoWrapHandler);
       newContractMap.set('NotionalMultiOracle', NotionalMultiOracle);
 
       // modules
@@ -248,7 +245,7 @@ const ChainProvider = ({ children }: any) => {
           case TokenType.ERC20_:
             assetContract = contracts.ERC20__factory.connect(asset.address, fallbackProvider);
             getBalance = async (acc) =>
-              ETH_BASED_ASSETS.includes(asset.idToUse)
+              ETH_BASED_ASSETS.includes(asset.proxyId)
                 ? fallbackProvider?.getBalance(acc)
                 : assetContract.balanceOf(acc);
             getAllowance = async (acc: string, spender: string) => assetContract.allowance(acc, spender);
@@ -281,6 +278,10 @@ const ChainProvider = ({ children }: any) => {
 
           assetContract,
 
+          /* re-add in the wrap handler addresses when charging, because cache doesn't preserve map */
+          wrapHandlerAddresses: ASSET_INFO.get(asset.id)?.wrapHandlerAddresses,
+          unwrapHandlerAddresses: ASSET_INFO.get(asset.id)?.unwrapHandlerAddresses,
+
           getBalance,
           getAllowance,
           setAllowance,
@@ -307,11 +308,13 @@ const ChainProvider = ({ children }: any) => {
           assetsAdded.map(async (x) => {
             const { assetId: id, asset: address } = x;
 
-            /* Get the basic hardcoded token info */
-            const assetInfo = ASSET_INFO.has(id) ? ASSET_INFO.get(id) : ASSET_INFO.get(UNKNOWN);
+            /* Get the basic hardcoded token info, if tooken is known, else get 'UNKNOWN' token */
+            const assetInfo = ASSET_INFO.has(id)
+              ? (ASSET_INFO.get(id) as IAssetInfo)
+              : (ASSET_INFO.get(UNKNOWN) as IAssetInfo);
             let { name, symbol, decimals, version } = assetInfo;
 
-            /* On first load Checks/Corrects the ERC20 name/symbol/decimals  (if possible ) */
+            /* On first load checks & corrects the ERC20 name/symbol/decimals (if possible ) */
             if (
               assetInfo.tokenType === TokenType.ERC20_ ||
               assetInfo.tokenType === TokenType.ERC20_Permit ||
@@ -328,7 +331,7 @@ const ChainProvider = ({ children }: any) => {
               }
             }
 
-            /* Checks/Corrects the version for ERC20Permit tokens */
+            /* checks & corrects the version for ERC20Permit/ DAI permit tokens */
             if (assetInfo.tokenType === TokenType.ERC20_Permit || assetInfo.tokenType === TokenType.ERC20_DaiPermit) {
               const contract = contracts.ERC20Permit__factory.connect(address, fallbackProvider);
               try {
@@ -336,12 +339,15 @@ const ChainProvider = ({ children }: any) => {
               } catch (e) {
                 console.log(
                   address,
-                  ': contract version auto-validation unsuccessfull. Please manually ensure version is correct.'
+                  ': contract VERSION auto-validation unsuccessfull. Please manually ensure version is correct.'
                 );
               }
             }
 
-            const idToUse = assetInfo?.wrappedTokenId || id; // here we are using the unwrapped id
+            /* check if an unwrapping handler is provided, if so, the token is considered to be a wrapped token */
+            const isWrappedToken = assetInfo.unwrapHandlerAddresses?.has(chainId);
+            /* check if a wrapping handler is provided, if so, wrapping is required */
+            const wrappingRequired = assetInfo.wrapHandlerAddresses?.has(chainId);
 
             const newAsset = {
               ...assetInfo,
@@ -352,11 +358,14 @@ const ChainProvider = ({ children }: any) => {
               decimals,
               version,
 
-              /* redirect the id/join if required due to using wrapped tokens */
-              joinAddress: joinMap.get(idToUse),
-              idToUse,
+              /* Redirect the id/join if required due to using wrapped tokens */
+              joinAddress: assetInfo.proxyId ? joinMap.get(assetInfo.proxyId) : joinMap.get(id),
+
+              isWrappedToken,
+              wrappingRequired,
+              proxyId: assetInfo.proxyId || id, // set proxyId  (or as baseId if undefined)
 
-              /* default setting of assetInfo fields if required */
+              /* Default setting of assetInfo fields if required */
               displaySymbol: assetInfo.displaySymbol || symbol,
               showToken: assetInfo.showToken || false,
             };
diff --git a/src/contexts/SettingsContext.tsx b/src/contexts/SettingsContext.tsx
index 71e156274..9acff45f0 100644
--- a/src/contexts/SettingsContext.tsx
+++ b/src/contexts/SettingsContext.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useEffect, useReducer } from 'react';
 import { ApprovalType, IChainContext, ISettingsContextState } from '../types';
 import { ChainContext } from './ChainContext';
 
-enum SettingsState {
+export enum Settings {
   APPROVAL_METHOD = 'approvalMethod',
   APPROVAL_MAX = 'approveMax',
   SLIPPAGE_TOLERANCE = 'slippageTolerance',
@@ -91,7 +91,7 @@ const SettingsProvider = ({ children }: any) => {
   /* watch & handle linked approval and effect appropriate settings */
   useEffect(() => {
     if (settingsState.approvalMethod === ApprovalType.SIG) {
-      updateState({ type: SettingsState.APPROVAL_MAX, payload: false });
+      updateState({ type: Settings.APPROVAL_MAX, payload: false });
     }
   }, [settingsState.approvalMethod]);
 
@@ -99,11 +99,11 @@ const SettingsProvider = ({ children }: any) => {
   useEffect(() => {
     if (connection.connectionName && connection.connectionName !== 'metamask') {
       console.log('Using manual ERC20 approval transactions');
-      updateState({ type: SettingsState.APPROVAL_MAX, payload: ApprovalType.TX });
+      updateState({ type: Settings.APPROVAL_MAX, payload: ApprovalType.TX });
     } else if (connection.connectionName === 'metamask') {
       /* On metamask default to SIG */
       console.log('Using ERC20Permit signing (EIP-2612) ');
-      updateState({ type: SettingsState.APPROVAL_METHOD, payload: ApprovalType.SIG });
+      updateState({ type: Settings.APPROVAL_METHOD, payload: ApprovalType.SIG });
     }
   }, [connection.connectionName]);
 
@@ -115,7 +115,7 @@ const SettingsProvider = ({ children }: any) => {
   /* Update all settings in state based on localStorage */
   useEffect(() => {
     if (typeof window !== 'undefined') {
-      Object.values(SettingsState).forEach((setting) => {
+      Object.values(Settings).forEach((setting) => {
         if (JSON.parse(localStorage.getItem(setting)) !== null) {
           updateState({ type: setting, payload: JSON.parse(localStorage.getItem(setting)) });
         }
diff --git a/src/contexts/UserContext.tsx b/src/contexts/UserContext.tsx
index f87f9791b..862df535f 100644
--- a/src/contexts/UserContext.tsx
+++ b/src/contexts/UserContext.tsx
@@ -224,7 +224,7 @@ const UserProvider = ({ children }: any) => {
 
       _publicData = await Promise.all(
         assetList.map(async (asset): Promise<IAssetRoot> => {
-          const isYieldBase = !!Array.from(seriesRootMap.values()).find((x) => x.baseId === asset?.idToUse);
+          const isYieldBase = !!Array.from(seriesRootMap.values()).find((x) => x.baseId === asset?.proxyId);
           return {
             ...asset,
             isYieldBase,
diff --git a/src/contexts/yieldEnv.json b/src/contexts/yieldEnv.json
index 20d691ebc..f10844c04 100644
--- a/src/contexts/yieldEnv.json
+++ b/src/contexts/yieldEnv.json
@@ -7,27 +7,29 @@
       "ChainlinkMultiOracle": "0xcDCe5C87f691058B61f3A65913f1a3cBCbAd9F52",
       "CompositeMultiOracle": "0xA81414a544D0bd8a28257F4038D3D24B08Dd9Bb4",
       "Witch": "0x53C3760670f6091E1eC76B4dd27f73ba4CAd5061",
-      "lidoWrapHandler": "0x491aB93faa921C8E634F891F96512Be14fD3DbB1",
       "YearnVaultMultiOracle": "0xC597E9cA52Afc13F7F5EDdaC9e53DEF569236016",
       "NotionalMultiOracle": "0x660bB2F1De01AacA46FCD8004e852234Cf65F3fb",
       "transfer1155Module": "0x97f1d43A217aDD678bB6Dcd3C5D51F40b6729d06",
       "WrapEtherModule": "0x22768FCaFe7BB9F03e31cb49823d1Ece30C0b8eA",
+      "StEthConvertor": "0x64BA0F1D2E5479BF132936328e8c533c95646fE8",
       "ConvexLadleModule": "0x9Bf195997581C99cef8be95a3a816Ca19Cf1A3e6"
     },
+
     "4": {
-      "Cauldron": "0xb2cf78ccA863675Ef61a0c696885DED0C833F8f3",
-      "Ladle": "0x45f502A7358ec631c7a422270922d7dFA142cb9C",
-      "CompoundMultiOracle": "0xeCA876c39DF7b75281Ea78eB35912fa1CC8f9482",
-      "ChainlinkMultiOracle": "0xBDBF01Ee32485aF94e316C395765F5Af2bf4b4dB",
-      "CompositeMultiOracle": "0x8482BF1e17ceF57109F34C259d39d5B9BB9A4e13",
-      "Witch": "0x5cEe0925647722e7ed32dcaf5A2DeFD3872Edb6F",
-      "lidoWrapHandler": "",
-      "YearnVaultMultiOracle": "0x88175a3e14F905ecCe464aF2A8E99f26159d4Cb8",
-      "NotionalMultiOracle": "0x67Ac817F9433c61c7472BC6B28bE07E1959427Ab",
-      "transfer1155Module": "0x39a4f3D170613e609823A699C9e09475E757ede4",
+      "Cauldron": "0x84EFA55faA9d774B4846c7a51c1C470232DFE50f",
+      "Ladle": "0xAE53c79926cb960feA17aF2369DE10938f5D0d52",
+      "CompoundMultiOracle": "0xe3D47c23c7EBddF81702421657fF7836d700bDF4",
+      "ChainlinkMultiOracle": "0xACD6af7bf3555C63686952C65b4a1D5E51c4586b",
+      "CompositeMultiOracle": "0x577DA88C253095b874941dda194a6c59489E644f",
+      "Witch": "0x2CEFcB458Ad3da4E880F11611CE7AFA81afe059e",
+      "YearnVaultMultiOracle": "0x392333A9d4CfCC529a7DA3F6021c5dfc6C54e1EF",
+      "NotionalMultiOracle": "0x5F5F54757Dd8c04E28F092EDb8013B51F33F4e8F",
+      "transfer1155Module": "0x532708fdC78C635162F94F65998E5014CAac34fF",
+      "StEthConvertor": "0x64BA0F1D2E5479BF132936328e8c533c95646fE8",
       "WrapEtherModule": "0x6C688D4257204FEe0Fce47d3feb9AE81e8B86283",
       "ConvexLadleModule": "0x9Bf195997581C99cef8be95a3a816Ca19Cf1A3e6"
     },
+
     "5": {
       "Cauldron": "0xF39bf75997176915a117Bb274eF6F20784B91568",
       "Ladle": "0xE34989E754e6fF29A0bcbe0A9b0ea818C93bff05",
@@ -42,17 +44,7 @@
       "WrapEtherModule": "0xDF3FF55C2Fc253f81DC8fDe2dd631e0f1c1d30fD",
       "ConvexLadleModule": "0x2d45a0925B3B4ac14641A63C2085574AC4E58fD8"
     },
-    "42": {
-      "Cauldron": "0x82Dfaef826C8c190E9b472896a9a99165Ccee35a",
-      "Ladle": "0xe7bae0445B9a1DBE834a7379fbE23C6d2Bd61C59",
-      "CompoundMultiOracle": "0x23F5F7a17117ba794Fcc5F46Fbf635edD2596Bb6",
-      "ChainlinkMultiOracle": "0xBcdc8bad83ca8053DFA6B1CBAEB7E71699254a3b",
-      "CompositeMultiOracle": "0xaF45D0277399E79Bf599d72fF4521f8Dc4A060E1",
-      "Witch": "0xA421B81481e0d150740f8F137FB10b1b747974a8",
-      "lidoWrapHandler": "0x491aB93faa921C8E634F891F96512Be14fD3DbB1",
-      "YearnVaultMultiOracle": "0xaF45D0277399E79Bf599d72fF4521f8Dc4A060E1",
-      "WrapEtherModule": "0xd6AdA52c4A04895c3Ef4668a1defd186ccD5aC44"
-    },
+
     "421611": {
       "Cauldron": "0x64BA0F1D2E5479BF132936328e8c533c95646fE8",
       "Ladle": "0xC5A62972418195031F931944f9C156d563De1fb4",
@@ -61,6 +53,7 @@
       "Witch": "0xf8eD39321927F5fae30EC33311F1fe596078ccbD",
       "WrapEtherModule": "0xd6AdA52c4A04895c3Ef4668a1defd186ccD5aC44"
     },
+
     "42161": {
       "Cauldron": "0x23cc87FBEBDD67ccE167Fa9Ec6Ad3b7fE3892E30",
       "Ladle": "0x16E25cf364CeCC305590128335B8f327975d0560",
@@ -82,12 +75,14 @@
       "0x47cc34188a2869daa1ce821c8758aa8442715831",
       "0x1565f539e96c4d440c38979dbc86fd711c995dd6"
     ],
+
     "4": [
       "0x8468B9154D777Dc4520fDA275d30D8D663841C1d",
       "0x6020a656a0421aFd96b02523D17fA23E206CD453",
       "0x1a017DBc08317b105E266139F888c7ae6eDd6a0F",
       "0xc946e0b5e815a7b22F563a569895663BE54f152A"
     ],
+
     "5": [
       "0x6A6786134D37b99E30ae529D61A4B69e2a8Af767",
       "0xD264691A0859C253636905C033E07fb7Ce551a1A",
@@ -98,6 +93,7 @@
       "0xb3292A7248880b185Ed8B28b5dcAABd7af4174c3",
       "0xCA781A66fD3ac5C9941500f579528D155A593f6E"
     ],
+
     "42": [
       "0xad1fBd05f4FDB81C1bAE82172E9913a7c4152154",
       "0xa2C7Fe53e34d3DCBD1FaeFd733fE72e35E10BbE5",
@@ -106,12 +102,14 @@
       "0xCde7FBa250F38EBA8AC47848594489A887475E9d",
       "0x4987185d8c5BC40d4E9dbB3E714b5711CAe1f502"
     ],
+
     "421611": [
       "0xDB52294DAa67E7a9a1A7C89A98Dc601Eb3a6E1ef",
       "0xe0b97c3965B5cA54198f08d685362d7172bE5eA5",
       "0xE6C0feb62C65196D5C50c65C3B4854dCe6D5f122",
       "0xFe0682B834865E541900311b991453cd0de11517"
     ],
+
     "42161": [
       "0xE779cd75E6c574d83D3FD6C92F3CBE31DD32B1E1",
       "0xE7214Af14BD70F6AAC9c16B0c1Ec9ee1CcC7EFDA",
diff --git a/src/contracts/LidoWrapHandler.d.ts b/src/contracts/LidoWrapHandler.d.ts
deleted file mode 100644
index 3bd5e06ec..000000000
--- a/src/contracts/LidoWrapHandler.d.ts
+++ /dev/null
@@ -1,193 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import {
-  ethers,
-  EventFilter,
-  Signer,
-  BigNumber,
-  BigNumberish,
-  PopulatedTransaction,
-  BaseContract,
-  ContractTransaction,
-  Overrides,
-  CallOverrides,
-} from "ethers";
-import { BytesLike } from "@ethersproject/bytes";
-import { Listener, Provider } from "@ethersproject/providers";
-import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi";
-import type { TypedEventFilter, TypedEvent, TypedListener } from "./common";
-
-interface LidoWrapHandlerInterface extends ethers.utils.Interface {
-  functions: {
-    "stETH()": FunctionFragment;
-    "unwrap(address)": FunctionFragment;
-    "wrap(address)": FunctionFragment;
-    "wstETH()": FunctionFragment;
-  };
-
-  encodeFunctionData(functionFragment: "stETH", values?: undefined): string;
-  encodeFunctionData(functionFragment: "unwrap", values: [string]): string;
-  encodeFunctionData(functionFragment: "wrap", values: [string]): string;
-  encodeFunctionData(functionFragment: "wstETH", values?: undefined): string;
-
-  decodeFunctionResult(functionFragment: "stETH", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "unwrap", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "wrap", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "wstETH", data: BytesLike): Result;
-
-  events: {
-    "Unwrapped(address,uint256)": EventFragment;
-    "Wrapped(address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Unwrapped"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Wrapped"): EventFragment;
-}
-
-export type UnwrappedEvent = TypedEvent<
-  [string, BigNumber] & { to: string; amount: BigNumber }
->;
-
-export type WrappedEvent = TypedEvent<
-  [string, BigNumber] & { to: string; amount: BigNumber }
->;
-
-export class LidoWrapHandler extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  listeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter?: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): Array<TypedListener<EventArgsArray, EventArgsObject>>;
-  off<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  on<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  once<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeListener<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    listener: TypedListener<EventArgsArray, EventArgsObject>
-  ): this;
-  removeAllListeners<EventArgsArray extends Array<any>, EventArgsObject>(
-    eventFilter: TypedEventFilter<EventArgsArray, EventArgsObject>
-  ): this;
-
-  listeners(eventName?: string): Array<Listener>;
-  off(eventName: string, listener: Listener): this;
-  on(eventName: string, listener: Listener): this;
-  once(eventName: string, listener: Listener): this;
-  removeListener(eventName: string, listener: Listener): this;
-  removeAllListeners(eventName?: string): this;
-
-  queryFilter<EventArgsArray extends Array<any>, EventArgsObject>(
-    event: TypedEventFilter<EventArgsArray, EventArgsObject>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TypedEvent<EventArgsArray & EventArgsObject>>>;
-
-  interface: LidoWrapHandlerInterface;
-
-  functions: {
-    stETH(overrides?: CallOverrides): Promise<[string]>;
-
-    unwrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    wrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<ContractTransaction>;
-
-    wstETH(overrides?: CallOverrides): Promise<[string]>;
-  };
-
-  stETH(overrides?: CallOverrides): Promise<string>;
-
-  unwrap(
-    to: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  wrap(
-    to: string,
-    overrides?: Overrides & { from?: string | Promise<string> }
-  ): Promise<ContractTransaction>;
-
-  wstETH(overrides?: CallOverrides): Promise<string>;
-
-  callStatic: {
-    stETH(overrides?: CallOverrides): Promise<string>;
-
-    unwrap(to: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    wrap(to: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    wstETH(overrides?: CallOverrides): Promise<string>;
-  };
-
-  filters: {
-    "Unwrapped(address,uint256)"(
-      to?: null,
-      amount?: null
-    ): TypedEventFilter<[string, BigNumber], { to: string; amount: BigNumber }>;
-
-    Unwrapped(
-      to?: null,
-      amount?: null
-    ): TypedEventFilter<[string, BigNumber], { to: string; amount: BigNumber }>;
-
-    "Wrapped(address,uint256)"(
-      to?: null,
-      amount?: null
-    ): TypedEventFilter<[string, BigNumber], { to: string; amount: BigNumber }>;
-
-    Wrapped(
-      to?: null,
-      amount?: null
-    ): TypedEventFilter<[string, BigNumber], { to: string; amount: BigNumber }>;
-  };
-
-  estimateGas: {
-    stETH(overrides?: CallOverrides): Promise<BigNumber>;
-
-    unwrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    wrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<BigNumber>;
-
-    wstETH(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    stETH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    unwrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    wrap(
-      to: string,
-      overrides?: Overrides & { from?: string | Promise<string> }
-    ): Promise<PopulatedTransaction>;
-
-    wstETH(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}
diff --git a/src/contracts/abis/LidoWrapHandler.json b/src/contracts/abis/LidoWrapHandler.json
deleted file mode 100644
index 11ab0fda2..000000000
--- a/src/contracts/abis/LidoWrapHandler.json
+++ /dev/null
@@ -1,120 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "contract IWstETH",
-        "name": "wstETH_",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IERC20",
-        "name": "stETH_",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Unwrapped",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      }
-    ],
-    "name": "Wrapped",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "stETH",
-    "outputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      }
-    ],
-    "name": "unwrap",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "unwrappedAmount",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      }
-    ],
-    "name": "wrap",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "wrappedAmount",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "wstETH",
-    "outputs": [
-      {
-        "internalType": "contract IWstETH",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]
diff --git a/src/contracts/factories/LidoWrapHandler__factory.ts b/src/contracts/factories/LidoWrapHandler__factory.ts
deleted file mode 100644
index 96e67504f..000000000
--- a/src/contracts/factories/LidoWrapHandler__factory.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import { Provider } from "@ethersproject/providers";
-import type {
-  LidoWrapHandler,
-  LidoWrapHandlerInterface,
-} from "../LidoWrapHandler";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract IWstETH",
-        name: "wstETH_",
-        type: "address",
-      },
-      {
-        internalType: "contract IERC20",
-        name: "stETH_",
-        type: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
-      },
-    ],
-    name: "Unwrapped",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
-      },
-    ],
-    name: "Wrapped",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "stETH",
-    outputs: [
-      {
-        internalType: "contract IERC20",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-    ],
-    name: "unwrap",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "unwrappedAmount",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-    ],
-    name: "wrap",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "wrappedAmount",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "wstETH",
-    outputs: [
-      {
-        internalType: "contract IWstETH",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-];
-
-export class LidoWrapHandler__factory {
-  static readonly abi = _abi;
-  static createInterface(): LidoWrapHandlerInterface {
-    return new utils.Interface(_abi) as LidoWrapHandlerInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): LidoWrapHandler {
-    return new Contract(address, _abi, signerOrProvider) as LidoWrapHandler;
-  }
-}
diff --git a/src/contracts/index.ts b/src/contracts/index.ts
index 7409b3b23..18d955aa9 100644
--- a/src/contracts/index.ts
+++ b/src/contracts/index.ts
@@ -17,7 +17,6 @@ export type { Join } from "./Join";
 export type { Join1155 } from "./Join1155";
 export type { Ladle } from "./Ladle";
 export type { LadleStorage } from "./LadleStorage";
-export type { LidoWrapHandler } from "./LidoWrapHandler";
 export type { NotionalMultiOracle } from "./NotionalMultiOracle";
 export type { Pool } from "./Pool";
 export type { Strategy } from "./Strategy";
@@ -43,7 +42,6 @@ export { Join__factory } from "./factories/Join__factory";
 export { Join1155__factory } from "./factories/Join1155__factory";
 export { Ladle__factory } from "./factories/Ladle__factory";
 export { LadleStorage__factory } from "./factories/LadleStorage__factory";
-export { LidoWrapHandler__factory } from "./factories/LidoWrapHandler__factory";
 export { NotionalMultiOracle__factory } from "./factories/NotionalMultiOracle__factory";
 export { Pool__factory } from "./factories/Pool__factory";
 export { Strategy__factory } from "./factories/Strategy__factory";
diff --git a/src/hooks/actionHooks/useAddCollateral.ts b/src/hooks/actionHooks/useAddCollateral.ts
index 0c1a1c914..d6d21b7cc 100644
--- a/src/hooks/actionHooks/useAddCollateral.ts
+++ b/src/hooks/actionHooks/useAddCollateral.ts
@@ -12,6 +12,7 @@ import {
   IAsset,
   IUserContextState,
   IUserContextActions,
+  IChainContext,
 } from '../../types';
 
 import { cleanValue, getTxCode } from '../../utils/appUtils';
@@ -26,7 +27,7 @@ import { ModuleActions } from '../../types/operations';
 export const useAddCollateral = () => {
   const {
     chainState: { contractMap },
-  } = useContext(ChainContext);
+  } = useContext(ChainContext) as IChainContext;
 
   const { userState, userActions }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
     UserContext
@@ -36,8 +37,7 @@ export const useAddCollateral = () => {
   const { updateAssets, updateVaults } = userActions;
 
   const { sign, transact } = useChain();
-  const { wrapAssetToJoin } = useWrapUnwrapAsset();
-
+  const { wrapAsset } = useWrapUnwrapAsset();
   const { addEth } = useAddRemoveEth();
 
   const addCollateral = async (vault: IVault | undefined, input: string) => {
@@ -46,10 +46,6 @@ export const useAddCollateral = () => {
 
     /* set the ilk based on if a vault has been selected or it's a new vault */
     const ilk: IAsset | null | undefined = vault ? assetMap.get(vault.ilkId) : selectedIlk;
-
-    const ilkForWrap: IAsset | null | undefined =
-      ilk?.isWrappedToken && ilk.unwrappedTokenId ? assetMap.get(ilk.unwrappedTokenId) : selectedIlk; // use the unwrapped token as ilk
-
     const base: IAsset | null | undefined = vault ? assetMap.get(vault.baseId) : selectedBase;
     const ladleAddress = contractMap.get('Ladle').address;
 
@@ -61,33 +57,46 @@ export const useAddCollateral = () => {
     const _input = ethers.utils.parseUnits(cleanedInput, ilk?.decimals);
 
     /* check if the ilk/asset is an eth asset variety, if so pour to Ladle */
-    const _isEthCollateral = ETH_BASED_ASSETS.includes(ilk?.id!);
-    const _pourTo = _isEthCollateral ? ladleAddress : account;
+    const isEthCollateral = ETH_BASED_ASSETS.includes(ilk?.proxyId!);
 
     /* is convex-type collateral */
-    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.idToUse!);
+    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.proxyId!);
     const ConvexLadleModuleContract = contractMap.get('ConvexLadleModule') as ConvexLadleModule;
 
-    /* handle wrapped tokens:  */
-    // const wrapping: ICallData[] = await wrapAssetToJoin(_input, ilkForWrap!, txCode); // note: selected ilk used here, not wrapped version
-
     /* if approveMAx, check if signature is required : note: getAllowance may return FALSE if ERC1155 */
     const _allowance = await ilk?.getAllowance(account!, ilk.joinAddress);
     const alreadyApproved = ethers.BigNumber.isBigNumber(_allowance) ? _allowance.gte(_input) : _allowance;
 
+    /* Handle wrapping of tokens:  */
+    const wrapAssetCallData: ICallData[] = await wrapAsset(_input, ilk!, txCode);
+
     /* Gather all the required signatures - sign() processes them and returns them as ICallData types */
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
           target: ilk!,
           spender: ilk?.joinAddress!,
           amount: _input,
-          ignoreIf: _isEthCollateral || alreadyApproved === true , // || wrapping.length > 0,
+          /* ignore if: 1) collateral is ETH 2) approved already 3) wrapAssets call is > 0 (because the permit is handled with wrapping) */
+          ignoreIf: isEthCollateral || alreadyApproved === true || wrapAssetCallData.length > 0,
         },
       ],
       txCode
     );
 
+    /* Handle adding eth if required (ie. if the ilk is ETH_BASED). If not, else simply sent ZERO to the addEth fn */
+    const addEthCallData: ICallData[] = addEth(
+      ETH_BASED_ASSETS.includes(selectedIlk?.proxyId!) ? _input : ZERO_BN,
+      undefined,
+      selectedIlk?.proxyId
+    );
+
+    /* pour destination based on ilk/asset is an eth asset variety */
+    const pourToAddress = () => {
+      if (isEthCollateral) return ladleAddress;
+      return account;
+    };
+
     /**
      * BUILD CALL DATA ARRAY
      * */
@@ -95,7 +104,7 @@ export const useAddCollateral = () => {
       /* If vault is null, build a new vault, else ignore */
       {
         operation: LadleActions.Fn.BUILD,
-        args: [selectedSeries?.id, selectedIlk?.idToUse, '0'] as LadleActions.Args.BUILD,
+        args: [selectedSeries?.id, selectedIlk?.proxyId, '0'] as LadleActions.Args.BUILD,
         ignoreIf: !!vault, // ignore if vault exists
       },
 
@@ -109,30 +118,27 @@ export const useAddCollateral = () => {
       },
 
       /* handle wrapped token deposit, if required */
-      // ...wrapping,
+      ...wrapAssetCallData,
 
-      /* Handle adding eth if required (ie. if the ilk is ETH_BASED). If not, else simply sent ZERO to the addEth fn */
-      ...addEth(ETH_BASED_ASSETS.includes(selectedIlk?.idToUse!) ? _input : ZERO_BN, undefined, selectedIlk?.idToUse),
+      /* add in add ETH calls */
+      ...addEthCallData,
 
       /* handle permits if required */
-      ...permits,
+      ...permitCallData,
 
       {
         operation: LadleActions.Fn.POUR,
-        args: [
-          vaultId,
-          _pourTo /* pour destination based on ilk/asset is an eth asset variety */,
-          _input,
-          ethers.constants.Zero,
-        ] as LadleActions.Args.POUR,
+        args: [vaultId, pourToAddress(), _input, ethers.constants.Zero] as LadleActions.Args.POUR,
         ignoreIf: false, // never ignore
       },
     ];
 
     /* TRANSACT */
     await transact(calls, txCode);
+
+    /* then update UI */
     updateVaults([vault!]);
-    updateAssets([base!, ilk!, ilkForWrap!]);
+    updateAssets([base!, ilk!]);
   };
 
   return { addCollateral };
diff --git a/src/hooks/actionHooks/useAddLiquidity.ts b/src/hooks/actionHooks/useAddLiquidity.ts
index 8b90f839f..5dac53ac3 100644
--- a/src/hooks/actionHooks/useAddLiquidity.ts
+++ b/src/hooks/actionHooks/useAddLiquidity.ts
@@ -17,7 +17,7 @@ import {
   ISettingsContext,
 } from '../../types';
 import { cleanValue, getTxCode } from '../../utils/appUtils';
-import { BLANK_VAULT, ONE_BN, ZERO_BN } from '../../utils/constants';
+import { BLANK_VAULT, ONE_BN } from '../../utils/constants';
 
 import { useChain } from '../useChain';
 
@@ -97,7 +97,7 @@ export const useAddLiquidity = () => {
     const alreadyApproved = (await _base.getAllowance(account!, ladleAddress)).gte(_input);
 
     /* if ethBase */
-    const isEthBase = ETH_BASED_ASSETS.includes(_base.id);
+    const isEthBase = ETH_BASED_ASSETS.includes(_base.proxyId);
 
     /* DIAGNOSITCS */
     console.log(
@@ -131,7 +131,7 @@ export const useAddLiquidity = () => {
     /**
      * GET SIGNTURE/APPROVAL DATA
      * */
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
           target: _base,
@@ -143,28 +143,39 @@ export const useAddLiquidity = () => {
       txCode
     );
 
+    /* if  Eth base, build the correct add ethCalls */
+    const addEthCallData = () => {
+      /* BUY send WETH to  poolAddress */
+      if (isEthBase && method === AddLiquidityType.BUY) return addEth(_input, _series.poolAddress);
+      /* BORROW send WETH to both basejoin and poolAddress */
+      if (isEthBase && method === AddLiquidityType.BORROW)
+        return [...addEth(_baseToFyToken, _base.joinAddress), ...addEth(_baseToPoolWithSlippage, _series.poolAddress)];
+      return []; // sends back an empty array [] if not eth base
+    };
+
     /**
      * BUILD CALL DATA ARRAY
      * */
     const calls: ICallData[] = [
-      ...permits,
+      ...permitCallData,
+
+      /* addETh calldata */
+
+      ...addEthCallData(),
 
       /**
        * Provide liquidity by BUYING :
        * */
 
-      /* addETh to poolAddress if isEthBase and using BUY method */
-      ...addEth(isEthBase && method === AddLiquidityType.BUY ? _input : ZERO_BN, _series.poolAddress),
       {
         operation: LadleActions.Fn.TRANSFER,
         args: [_base.address, _series.poolAddress, _input] as LadleActions.Args.TRANSFER,
         ignoreIf: method !== AddLiquidityType.BUY || isEthBase, // ignore if not BUY and POOL or isETHbase
       },
-
       {
         operation: LadleActions.Fn.ROUTE,
         args: [
-          strategy.id || account, // receiver is _strategyAddress (if it exists) or else account
+          strategy.id || account, // NOTE GOTCHA: receiver is _strategyAddress (if it exists) or else account
           account,
           _fyTokenToBeMinted,
           minRatio,
@@ -180,17 +191,11 @@ export const useAddLiquidity = () => {
        * */
       {
         operation: LadleActions.Fn.BUILD,
-        args: [_series.id, _base.idToUse, '0'] as LadleActions.Args.BUILD,
+        args: [_series.id, _base.proxyId, '0'] as LadleActions.Args.BUILD,
         ignoreIf: method !== AddLiquidityType.BORROW ? true : !!matchingVaultId, // ignore if not BORROW and POOL
       },
 
-      /* addETh to joinAddress and poolAddress if isEthBase and using BORROW method */
-      ...addEth(isEthBase && method === AddLiquidityType.BORROW ? _baseToFyToken : ZERO_BN, _base.joinAddress),
-      ...addEth(
-        isEthBase && method === AddLiquidityType.BORROW ? _baseToPoolWithSlippage : ZERO_BN,
-        _series.poolAddress
-      ),
-
+      /* Note: two transfers */
       {
         operation: LadleActions.Fn.TRANSFER,
         args: [_base.address, _base.joinAddress, _baseToFyToken] as LadleActions.Args.TRANSFER,
@@ -223,8 +228,8 @@ export const useAddLiquidity = () => {
       /**
        *
        * STRATEGY TOKEN MINTING
-       * (for all AddLiquididy recipes that use strategy >
-       *  if strategy address is provided, and is found in the strategyMap, use that address
+       * for all AddLiquidity recipes that use strategy >
+       * if strategy address is provided, and is found in the strategyMap, use that address
        *
        * */
       {
diff --git a/src/hooks/actionHooks/useAddRemoveEth.ts b/src/hooks/actionHooks/useAddRemoveEth.ts
index 2c3f43d7a..65a4976a1 100644
--- a/src/hooks/actionHooks/useAddRemoveEth.ts
+++ b/src/hooks/actionHooks/useAddRemoveEth.ts
@@ -2,23 +2,21 @@ import { BigNumber } from 'ethers';
 import { useContext } from 'react';
 import { ChainContext } from '../../contexts/ChainContext';
 import { UserContext } from '../../contexts/UserContext';
-
 import { ICallData, LadleActions, IUserContext, IUserContextState, IUserContextActions } from '../../types';
 import { ModuleActions } from '../../types/operations';
 import { ZERO_BN } from '../../utils/constants';
 
 export const useAddRemoveEth = () => {
-
   const {
     chainState: { contractMap },
   } = useContext(ChainContext);
-  
+
   const { userState }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
     UserContext
   ) as IUserContext;
 
   const { activeAccount: account } = userState;
-  const WrapEtherModuleContract =  contractMap.get('WrapEtherModule');
+  const WrapEtherModuleContract = contractMap.get('WrapEtherModule');
 
   const addEth = (
     value: BigNumber,
@@ -28,33 +26,33 @@ export const useAddRemoveEth = () => {
     /* if there is a destination 'to' then use the ladle module (wrapEtherModule) */
     to
       ? [
-        {
-          operation: LadleActions.Fn.MODULE,
-          fnName: ModuleActions.Fn.WRAP_ETHER_MODULE,
-          args: [ to || account, value ] as ModuleActions.Args.WRAP_ETHER_MODULE,
-          targetContract: WrapEtherModuleContract,
-          ignoreIf: value.lte(ZERO_BN), // ignores if value is 0 or negative
-          overrides: { value },
-        },
-      ]:
-      /* else use simple JOIN_ETHER with optional */ 
-      [
-        {
-          operation: LadleActions.Fn.JOIN_ETHER,
-          args: [alternateEthAssetId || '0x303000000000'] as LadleActions.Args.JOIN_ETHER,
-          ignoreIf: value.lte(ZERO_BN), // ignores if value is zero OR NEGATIVE
-          overrides: { value },
-        },
-      ];
-
-  // NOTE:  EXIT_ETHER sweeps all out of the ladle, so *value* is not important > it must just be bigger than zero to not be ignored     
-  const removeEth = (value: BigNumber, to: string|undefined = undefined): ICallData[] => [
           {
-            operation: LadleActions.Fn.EXIT_ETHER,
-            args: [to || account] as LadleActions.Args.EXIT_ETHER,
-            ignoreIf: value.eq(ZERO_BN), // ignores if value is ZERO. NB NOTE: sign (+-) is irrelevant here
+            operation: LadleActions.Fn.MODULE,
+            fnName: ModuleActions.Fn.WRAP_ETHER_MODULE,
+            args: [to || account, value] as ModuleActions.Args.WRAP_ETHER_MODULE,
+            targetContract: WrapEtherModuleContract,
+            ignoreIf: value.lte(ZERO_BN), // ignores if value is 0 or negative
+            overrides: { value },
           },
         ]
+      : /* else use simple JOIN_ETHER  with optional */
+        [
+          {
+            operation: LadleActions.Fn.JOIN_ETHER,
+            args: [alternateEthAssetId || '0x303000000000'] as LadleActions.Args.JOIN_ETHER, // use alt eth ID if reqd. defaults to WETH
+            ignoreIf: value.lte(ZERO_BN), // ignores if value is zero OR NEGATIVE
+            overrides: { value },
+          },
+        ];
+
+  // NOTE: EXIT_ETHER sweeps all out of the ladle, so *value* is not important > it must just be bigger than zero to not be ignored
+  const removeEth = (value: BigNumber, to: string | undefined = undefined): ICallData[] => [
+    {
+      operation: LadleActions.Fn.EXIT_ETHER,
+      args: [to || account] as LadleActions.Args.EXIT_ETHER,
+      ignoreIf: value.eq(ZERO_BN), // ignores if value is ZERO. NB NOTE: sign (+-) is irrelevant here
+    },
+  ];
 
   return { addEth, removeEth };
 };
diff --git a/src/hooks/actionHooks/useBorrow.ts b/src/hooks/actionHooks/useBorrow.ts
index 0c90a2d99..2ce34c470 100644
--- a/src/hooks/actionHooks/useBorrow.ts
+++ b/src/hooks/actionHooks/useBorrow.ts
@@ -43,86 +43,113 @@ export const useBorrow = () => {
 
   const { addEth, removeEth } = useAddRemoveEth();
 
-  const { wrapAssetToJoin } = useWrapUnwrapAsset();
+  const { wrapAsset } = useWrapUnwrapAsset();
   const { sign, transact } = useChain();
 
-  const borrow = async (vault: IVault | undefined, input: string | undefined, collInput: string | undefined) => {
+  const borrow = async (
+    vault: IVault | undefined,
+    input: string | undefined,
+    collInput: string | undefined,
+    getValuesFromNetwork: boolean = true // get market values by network call or offline calc (default: NETWORK)
+  ) => {
     /* generate the reproducible txCode for tx tracking and tracing */
     const txCode = getTxCode(ActionCodes.BORROW, selectedSeries?.id!);
     /* use the vault id provided OR 0 if new/ not provided */
     const vaultId = vault?.id || BLANK_VAULT;
 
+    const ladleAddress = contractMap.get('Ladle').address;
+
     /* Set the series and ilk based on the vault that has been selected or if it's a new vault, get from the globally selected SeriesId */
     const series: ISeries = vault ? seriesMap.get(vault.seriesId)! : selectedSeries!;
     const base: IAsset = assetMap.get(series.baseId)!;
-    const ilk: IAsset = vault ? assetMap.get(vault.ilkId)! : assetMap.get(selectedIlk?.idToUse!)!; // note: we use the wrapped version if required
 
-    const ladleAddress = contractMap.get('Ladle').address;
+    const ilkToUse: IAsset = vault ? assetMap.get(vault.ilkId)! : assetMap.get(selectedIlk?.proxyId)!; // note: we use the wrapped version if required
 
     /* is ETH  used as collateral */
-    const isEthCollateral = ETH_BASED_ASSETS.includes(selectedIlk?.idToUse!);
+    const isEthCollateral = ETH_BASED_ASSETS.includes(selectedIlk?.proxyId);
     /* is ETH being Borrowed   */
     const isEthBase = ETH_BASED_ASSETS.includes(series.baseId);
 
     /* is convex-type collateral */
-    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.idToUse!);
+    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.proxyId);
     const ConvexLadleModuleContract = contractMap.get('ConvexLadleModule') as ConvexLadleModule;
 
     /* parse inputs  (clean down to base/ilk decimals so that there is never an underlow)  */
     const cleanInput = cleanValue(input, base.decimals);
     const _input = input ? ethers.utils.parseUnits(cleanInput, base.decimals) : ethers.constants.Zero;
-    const cleanCollInput = cleanValue(collInput, ilk.decimals);
-    const _collInput = collInput ? ethers.utils.parseUnits(cleanCollInput, ilk.decimals) : ethers.constants.Zero;
-
-    /* Calculate expected debt (fytokens) */
-    const _expectedFyToken = buyBase(
-      series.baseReserves,
-      series.fyTokenReserves,
-      _input,
-      series.getTimeTillMaturity(),
-      series.ts,
-      series.g2,
-      series.decimals
-    );
+    const cleanCollInput = cleanValue(collInput, ilkToUse.decimals);
+    const _collInput = collInput ? ethers.utils.parseUnits(cleanCollInput, ilkToUse.decimals) : ethers.constants.Zero;
+
+    /* Calculate expected debt (fytokens) from either network or calculated */
+    const _expectedFyToken = getValuesFromNetwork
+      ? await series.poolContract.buyBasePreview(_input)
+      : buyBase(
+          series.baseReserves,
+          series.fyTokenReserves,
+          _input,
+          series.getTimeTillMaturity(),
+          series.ts,
+          series.g2,
+          series.decimals
+        );
     const _expectedFyTokenWithSlippage = calculateSlippage(_expectedFyToken, slippageTolerance);
 
     /* if approveMAx, check if signature is required : note: getAllowance may return FALSE if ERC1155 */
-    const _allowance = await ilk.getAllowance(account!, ilk.joinAddress);
-    const alreadyApproved = ethers.BigNumber.isBigNumber(_allowance) ? _allowance.gte(_collInput) : _allowance;
-
-    const wrapping: ICallData[] = await wrapAssetToJoin(_collInput, selectedIlk!, txCode); // note: selected ilk used here, not wrapped version
+    const _allowance = await ilkToUse.getAllowance(account!, ilkToUse.joinAddress);
 
+    const alreadyApproved = ethers.BigNumber.isBigNumber(_allowance) ? _allowance.gte(_collInput) : _allowance;
     console.log('Already approved', alreadyApproved);
 
+    /* handle ETH deposit as Collateral, if required (only if collateral used is ETH-based ), else send ZERO_BN */
+    const addEthCallData: ICallData[] = addEth(isEthCollateral ? _collInput : ZERO_BN);
+    /* handle remove/unwrap WETH > if ETH is what is being borrowed */
+    const removeEthCallData: ICallData[] = removeEth(isEthBase ? ONE_BN : ZERO_BN); // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
+    /* handle wrapping of collateral if required */
+    const wrapAssetCallData: ICallData[] = await wrapAsset(_collInput, selectedIlk!, txCode); // note: selected ilk used here, not wrapped version
+
     /* Gather all the required signatures - sign() processes them and returns them as ICallData types */
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
-          target: ilk,
-          spender: ilk.joinAddress,
+          target: ilkToUse,
+          spender: ilkToUse.joinAddress,
           amount: _collInput,
           ignoreIf:
-            alreadyApproved === true ||
-            ETH_BASED_ASSETS.includes(selectedIlk?.idToUse!) ||
-            _collInput.eq(ethers.constants.Zero) ||
-            wrapping.length > 0,
+            alreadyApproved === true || // Ignore if already approved
+            ETH_BASED_ASSETS.includes(ilkToUse.id) || // Ignore if dealing with an eTH based collateral
+            _collInput.eq(ethers.constants.Zero), // || // ignore if zero collateral value
+          // wrapAssetCallData.length > 0, // Ignore if dealing with a wrapped collateral!
         },
       ],
       txCode
     );
 
-    /* Collate all the calls required for the process (including depositing ETH, signing permits, and building vault if needed) */
+    /* if ETH is being borrowed, send the borrowed tokens (WETH) to ladle for unwrapping */
+    const serveToAddress = () => {
+      if (isEthBase) return ladleAddress;
+      // if ( wrapping  ) return wrapHandler
+      return account;
+    };
+
+    /**
+     *
+     * Collate all the calls required for the process (including depositing ETH, signing permits, and building vault if needed)
+     *
+     * */
     const calls: ICallData[] = [
       /* handle wrapped token deposit, if required */
-      ...wrapping,
+      ...wrapAssetCallData,
 
       /* Include all the signatures gathered, if required */
-      ...permits,
+      ...permitCallData,
+
+      /* add in the ETH deposit if required */
+      ...addEthCallData,
 
       /* If vault is null, build a new vault, else ignore */
       {
         operation: LadleActions.Fn.BUILD,
-        args: [selectedSeries?.id, selectedIlk?.idToUse, '0'] as LadleActions.Args.BUILD,
+        args: [selectedSeries?.id, ilkToUse.id, '0'] as LadleActions.Args.BUILD,
         ignoreIf: !!vault,
       },
 
@@ -130,31 +157,20 @@ export const useBorrow = () => {
       {
         operation: LadleActions.Fn.MODULE,
         fnName: ModuleActions.Fn.ADD_VAULT,
-        args: [selectedIlk.joinAddress, vaultId] as ModuleActions.Args.ADD_VAULT,
+        args: [ilkToUse.joinAddress, vaultId] as ModuleActions.Args.ADD_VAULT,
         targetContract: ConvexLadleModuleContract,
         ignoreIf: !!vault || !isConvexCollateral,
       },
 
-      /* handle ETH deposit as Collateral, if required  (only if collateral used is ETH-based ), else send ZERO_BN */
-      ...addEth(isEthCollateral ? _collInput : ZERO_BN),
-
       {
         operation: LadleActions.Fn.SERVE,
-        args: [
-          vaultId,
-          isEthBase ? ladleAddress : account, // if ETH is being borrowed, send the borrowed tokens (WETH) to ladle
-          _collInput,
-          _input,
-          _expectedFyTokenWithSlippage,
-        ] as LadleActions.Args.SERVE,
+        args: [vaultId, serveToAddress(), _collInput, _input, _expectedFyTokenWithSlippage] as LadleActions.Args.SERVE,
         ignoreIf: false,
       },
-
-      /* handle remove/unwrap WETH > if ETH is what is being borrowed */
-      ...removeEth(isEthBase ? ONE_BN : ZERO_BN), // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
+      ...removeEthCallData,
     ];
 
-    /* handle the transaction */
+    /* finally, handle the transaction */
     await transact(calls, txCode);
 
     /* When complete, update vaults.
@@ -162,7 +178,7 @@ export const useBorrow = () => {
       else update ALL vaults (by passing an empty array)
     */
     updateVaults([]);
-    updateAssets([base, ilk, selectedIlk!]);
+    updateAssets([base, ilkToUse, selectedIlk!]);
     updateSeries([series]);
   };
 
diff --git a/src/hooks/actionHooks/useClosePosition.ts b/src/hooks/actionHooks/useClosePosition.ts
index 616ccf30c..17ee0725f 100644
--- a/src/hooks/actionHooks/useClosePosition.ts
+++ b/src/hooks/actionHooks/useClosePosition.ts
@@ -16,7 +16,7 @@ import {
   IUserContextActions,
 } from '../../types';
 import { cleanValue, getTxCode } from '../../utils/appUtils';
-import { ONE_BN, ZERO_BN } from '../../utils/constants';
+import { ONE_BN } from '../../utils/constants';
 import { buyBase, calculateSlippage } from '../../utils/yieldMath';
 import { useChain } from '../useChain';
 import { useAddRemoveEth } from './useAddRemoveEth';
@@ -75,7 +75,7 @@ export const useClosePosition = () => {
     /* if approveMAx, check if signature is required */
     const alreadyApproved = (await series.fyTokenContract.allowance(account!, ladleAddress)).gte(_fyTokenValueOfInput);
 
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
           target: series,
@@ -87,13 +87,28 @@ export const useClosePosition = () => {
       txCode
     );
 
+    const removeEthCallData = isEthBase ? removeEth(ONE_BN) : [];
+
+    /* Set the transferTo address based on series maturity */
+    const transferToAddress = () => {
+      if (seriesIsMature) return fyTokenAddress;
+      return poolAddress;
+    };
+
+    /* receiver based on whether base is ETH (- or wrapped Base) */
+    const receiverAddress = () => {
+      if (isEthBase) return ladleAddress;
+      // if ( unwrapping) return unwrapHandlerAddress;
+      return account;
+    };
+
     const calls: ICallData[] = [
-      ...permits,
+      ...permitCallData,
       {
         operation: LadleActions.Fn.TRANSFER,
         args: [
           fyTokenAddress,
-          seriesIsMature ? fyTokenAddress : poolAddress, // select destination based on maturity
+          transferToAddress(), // select destination based on maturity
           _fyTokenValueOfInput,
         ] as LadleActions.Args.TRANSFER,
         ignoreIf: false, // never ignore, even after maturity because we go through the ladle.
@@ -102,7 +117,7 @@ export const useClosePosition = () => {
       /* BEFORE MATURITY */
       {
         operation: LadleActions.Fn.ROUTE,
-        args: [isEthBase ? ladleAddress : account, _inputWithSlippage] as RoutedActions.Args.SELL_FYTOKEN,
+        args: [receiverAddress(), _inputWithSlippage] as RoutedActions.Args.SELL_FYTOKEN,
         fnName: RoutedActions.Fn.SELL_FYTOKEN,
         targetContract: series.poolContract,
         ignoreIf: seriesIsMature,
@@ -111,11 +126,11 @@ export const useClosePosition = () => {
       /* AFTER MATURITY */
       {
         operation: LadleActions.Fn.REDEEM,
-        args: [series.id, isEthBase ? ladleAddress : account, _fyTokenValueOfInput] as LadleActions.Args.REDEEM,
+        args: [series.id, receiverAddress(), _fyTokenValueOfInput] as LadleActions.Args.REDEEM,
         ignoreIf: !seriesIsMature,
       },
 
-      ...removeEth(isEthBase ? ONE_BN : ZERO_BN), // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
+      ...removeEthCallData, // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
     ];
     await transact(calls, txCode);
     updateSeries([series]);
diff --git a/src/hooks/actionHooks/useLend.ts b/src/hooks/actionHooks/useLend.ts
index 0f9de01e3..dc90ad56a 100644
--- a/src/hooks/actionHooks/useLend.ts
+++ b/src/hooks/actionHooks/useLend.ts
@@ -16,7 +16,6 @@ import {
   IUserContextState,
 } from '../../types';
 import { cleanValue, getTxCode } from '../../utils/appUtils';
-import { ZERO_BN } from '../../utils/constants';
 import { calculateSlippage, sellBase } from '../../utils/yieldMath';
 import { useChain } from '../useChain';
 import { useAddRemoveEth } from './useAddRemoveEth';
@@ -72,7 +71,7 @@ export const useLend = () => {
     /* ETH is used as a base */
     const isEthBase = ETH_BASED_ASSETS.includes(series.baseId);
 
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
           target: base,
@@ -84,10 +83,14 @@ export const useLend = () => {
       txCode
     );
 
-    const calls: ICallData[] = [
-      ...permits,
+    const addEthCallData = () => {
+      if (isEthBase) return addEth(_input, series.poolAddress);
+      return [];
+    };
 
-      ...addEth(isEthBase ? _input : ZERO_BN, series.poolAddress),
+    const calls: ICallData[] = [
+      ...permitCallData,
+      ...addEthCallData(),
       {
         operation: LadleActions.Fn.TRANSFER,
         args: [base.address, series.poolAddress, _input] as LadleActions.Args.TRANSFER,
diff --git a/src/hooks/actionHooks/useRemoveCollateral.ts b/src/hooks/actionHooks/useRemoveCollateral.ts
index 7fc178d79..d0a38ac6a 100644
--- a/src/hooks/actionHooks/useRemoveCollateral.ts
+++ b/src/hooks/actionHooks/useRemoveCollateral.ts
@@ -1,7 +1,6 @@
 import { ethers } from 'ethers';
 import { useContext } from 'react';
 import { ChainContext } from '../../contexts/ChainContext';
-import { SettingsContext } from '../../contexts/SettingsContext';
 import { UserContext } from '../../contexts/UserContext';
 import {
   ICallData,
@@ -22,53 +21,54 @@ import { useAddRemoveEth } from './useAddRemoveEth';
 import { ONE_BN, ZERO_BN } from '../../utils/constants';
 import { ConvexJoin__factory } from '../../contracts';
 
-// TODO will fail if balance of join is less than amount
 export const useRemoveCollateral = () => {
   const {
-    chainState: { contractMap, provider },
+    chainState: {
+      contractMap,
+      connection: { chainId },
+      provider,
+    },
   } = useContext(ChainContext);
   const { userState, userActions }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
     UserContext
   ) as IUserContext;
   const { activeAccount: account, selectedIlk, assetMap } = userState;
   const { updateAssets, updateVaults } = userActions;
-  const {
-    settingsState: { unwrapTokens },
-  } = useContext(SettingsContext) as ISettingsContext;
-
   const { transact } = useChain();
-
   const { removeEth } = useAddRemoveEth();
   const { unwrapAsset } = useWrapUnwrapAsset();
 
-  const removeCollateral = async (vault: IVault, input: string) => {
+  const removeCollateral = async (vault: IVault, input: string, unwrapOnRemove: boolean = true) => {
     /* generate the txCode for tx tracking and tracing */
     const txCode = getTxCode(ActionCodes.REMOVE_COLLATERAL, vault.id);
 
     /* get associated series and ilk */
     const ilk = assetMap.get(vault.ilkId)!;
     const ladleAddress = contractMap.get('Ladle').address;
+    /* get unwrap handler if required */
+    const unwrapHandlerAddress = ilk.unwrapHandlerAddresses?.get(chainId);
+    /* check if the ilk/asset is an eth asset variety OR if it is wrapped token, if so pour to Ladle */
+    const isEthCollateral = ETH_BASED_ASSETS.includes(ilk.proxyId);
 
     /* parse inputs to BigNumber in Wei, and NEGATE */
     const cleanedInput = cleanValue(input, ilk.decimals);
-    const _input = ethers.utils.parseUnits(cleanedInput, ilk.decimals).mul(-1);
+    const _input = ethers.utils.parseUnits(cleanedInput, ilk.decimals);
 
-    /* check if the ilk/asset is an eth asset variety OR if it is wrapped token, if so pour to Ladle */
-    const isEthCollateral = ETH_BASED_ASSETS.includes(ilk.id);
-    // const isEthBase = ETH_BASED_ASSETS.includes(selectedIlk?.idToUse!);
+    /* handle wrapped tokens:  */
+    const unwrapCallData: ICallData[] = unwrapOnRemove ? await unwrapAsset(ilk, account) : [];
+    const removeEthCallData: ICallData[] = isEthCollateral ? removeEth(ONE_BN) : []; // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
 
     /* is convex-type collateral */
-    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.idToUse!);
+    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(selectedIlk?.proxyId!);
     const convexJoinContract = ConvexJoin__factory.connect(ilk.joinAddress, provider);
 
-    let _pourTo = isEthCollateral ? ladleAddress : account;
-
-    /* handle wrapped tokens:  */
-    let unwrap: ICallData[] = [];
-    if (ilk.wrapHandlerAddress && unwrapTokens) {
-      _pourTo = ilk.wrapHandlerAddress;
-      unwrap = await unwrapAsset(ilk, account!);
-    }
+    /* pour destination based on ilk/asset is an eth asset variety ( or unwrapHadnler address if unwrapping) */
+    const pourToAddress = () => {
+      console.log('Requires unwrapping? ', unwrapCallData.length);
+      if (isEthCollateral) return ladleAddress;
+      if (unwrapCallData.length) return unwrapHandlerAddress; // if there is something to unwrap
+      return account;
+    };
 
     const calls: ICallData[] = [
       /* convex-type collateral; ensure checkpoint before giving collateral back to account */
@@ -83,14 +83,14 @@ export const useRemoveCollateral = () => {
         operation: LadleActions.Fn.POUR,
         args: [
           vault.id,
-          _pourTo /* pour destination based on ilk/asset is an eth asset variety */,
-          _input,
-          ethers.constants.Zero,
+          pourToAddress(),
+          _input.mul(-1), // NOTE: negated value!
+          ZERO_BN, // No debt written off
         ] as LadleActions.Args.POUR,
         ignoreIf: false,
       },
-      ...removeEth(isEthCollateral ? ONE_BN : ZERO_BN), // (exit_ether sweeps all the eth out the ladle, so exact amount is not importnat -> just greater than zero)
-      ...unwrap,
+      ...removeEthCallData,
+      ...unwrapCallData,
     ];
 
     await transact(calls, txCode);
diff --git a/src/hooks/actionHooks/useRemoveLiquidity.ts b/src/hooks/actionHooks/useRemoveLiquidity.ts
index 0f3b2cc0b..48af7a0de 100644
--- a/src/hooks/actionHooks/useRemoveLiquidity.ts
+++ b/src/hooks/actionHooks/useRemoveLiquidity.ts
@@ -160,10 +160,14 @@ export const useRemoveLiquidity = () => {
       ? (await series.poolContract.allowance(account!, ladleAddress)).gte(_input)
       : false;
 
-    const isEthBase = ETH_BASED_ASSETS.includes(_base.id);
+    const isEthBase = ETH_BASED_ASSETS.includes(_base.proxyId);
     const toAddress = isEthBase ? ladleAddress : account;
 
-    const permits: ICallData[] = await sign(
+    /* handle removeing eth BAse tokens:  */
+    // NOTE: REMOVE ETH FOR ALL PATHS/OPTIONS (exit_ether sweeps all the eth out the ladle, so exact amount is not important -> just greater than zero)
+    const removeEthCallData: ICallData[] = isEthBase ? removeEth(ONE_BN) : [];
+
+    const permitCallData: ICallData[] = await sign(
       [
         /* give strategy permission to sell tokens to pool */
         {
@@ -192,7 +196,7 @@ export const useRemoveLiquidity = () => {
     // const unwrapping: ICallData[] = await unwrapAsset(_base, account)
 
     const calls: ICallData[] = [
-      ...permits,
+      ...permitCallData,
 
       /* FOR ALL REMOVES (when using a strategy) > move tokens from strategy to pool tokens  */
       {
@@ -314,8 +318,7 @@ export const useRemoveLiquidity = () => {
         ignoreIf: !series.seriesIsMature,
       },
 
-      // NOTE: REMOVE ETH FOR ALL PATHS/OPTIONS (exit_ether sweeps all the eth out the ladle, so exact amount is not important -> just greater than zero)
-      ...removeEth(isEthBase ? ONE_BN : ZERO_BN),
+      ...removeEthCallData,
     ];
 
     await transact(calls, txCode);
diff --git a/src/hooks/actionHooks/useRepayDebt.ts b/src/hooks/actionHooks/useRepayDebt.ts
index 3435068f2..01de61aec 100644
--- a/src/hooks/actionHooks/useRepayDebt.ts
+++ b/src/hooks/actionHooks/useRepayDebt.ts
@@ -21,8 +21,10 @@ import { CONVEX_BASED_ASSETS, ETH_BASED_ASSETS } from '../../config/assets';
 import { SettingsContext } from '../../contexts/SettingsContext';
 import { useAddRemoveEth } from './useAddRemoveEth';
 import { ONE_BN, ZERO_BN } from '../../utils/constants';
+import { useWrapUnwrapAsset } from './useWrapUnwrapAsset';
 import { ConvexJoin__factory } from '../../contracts';
 
+
 export const useRepayDebt = () => {
   const {
     settingsState: { slippageTolerance },
@@ -36,10 +38,15 @@ export const useRepayDebt = () => {
   const { updateVaults, updateAssets } = userActions;
 
   const {
-    chainState: { contractMap, provider },
+    chainState: {
+      contractMap,
+      connection: { chainId },
+      provider
+    },
   } = useContext(ChainContext);
 
   const { addEth, removeEth } = useAddRemoveEth();
+  const { unwrapAsset } = useWrapUnwrapAsset();
   const { sign, transact } = useChain();
 
   /**
@@ -60,7 +67,7 @@ export const useRepayDebt = () => {
     const isEthBase = ETH_BASED_ASSETS.includes(series.baseId);
 
     /* is convex-type collateral */
-    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(ilk.idToUse);
+    const isConvexCollateral = CONVEX_BASED_ASSETS.includes(ilk.proxyId);
     const convexJoinContract = ConvexJoin__factory.connect(ilk.joinAddress, provider);
 
     /* Parse inputs */
@@ -103,9 +110,6 @@ export const useRepayDebt = () => {
     const _collateralToRemove =
       reclaimCollateral && inputGreaterThanEqualDebt ? vault.ink.mul(-1) : ethers.constants.Zero;
 
-    /* Address to send the funds to either ladle (if eth is used as collateral) or account */
-    const reclaimToAddress = isEthCollateral ? ladleAddress : account;
-
     /* Cap the amount to transfer: check that if input is greater than debt, used after maturity only repay the max debt (or accrued debt) */
     const _inputCappedAtArt = vault.art.gt(ZERO_BN) && vault.art.lte(_input) ? vault.art : _input;
 
@@ -118,7 +122,10 @@ export const useRepayDebt = () => {
     /* Check if already apporved */
     const alreadyApproved = (await base.getAllowance(account!, ladleAddress)).gte(amountToTransfer);
 
-    const permits: ICallData[] = await sign(
+    // const wrapAssetCallData : ICallData[] = await wrapAsset(ilk, account!);
+    const unwrapAssetCallData: ICallData[] = reclaimCollateral ? await unwrapAsset(ilk, account!) : [];
+
+    const permitCallData: ICallData[] = await sign(
       [
         {
           // before maturity
@@ -131,13 +138,28 @@ export const useRepayDebt = () => {
       txCode
     );
 
+    /* Remove ETH collateral. (exit_ether sweeps all the eth out of the ladle, so exact amount is not importnat -> just greater than zero) */
+    const removeEthCallData = isEthCollateral ? removeEth(ONE_BN) : [];
+
+    /* Address to send the funds to either ladle (if eth is used as collateral) or account */
+    const reclaimToAddress = () => {
+      if (isEthCollateral) return ladleAddress;
+      if (unwrapAssetCallData.length && ilk.unwrapHandlerAddresses?.has(chainId))
+        return ilk.unwrapHandlerAddresses?.get(chainId); // if there is somethign to unwrap
+      return account;
+    };
+
     const calls: ICallData[] = [
-      ...permits,
+      ...permitCallData,
+
+      /* Reqd. when we have a wrappedBase */
+      // ...wrapAssetCallData
 
       /* If ethBase, Send ETH to either base join or pool  */
       ...addEth(isEthBase && !series.seriesIsMature ? amountToTransfer : ZERO_BN, transferToAddress), // destination = either join or series depending if tradeable
       ...addEth(isEthBase && series.seriesIsMature ? amountToTransfer : ZERO_BN), // no destination defined after maturity , input +1% will will go to weth join
-      /* else, Send Token to either join or pool via a ladle.transfer() */
+
+      /* Else, Send Token to either join or pool via a ladle.transfer() */
       {
         operation: LadleActions.Fn.TRANSFER,
         args: [base.address, transferToAddress, amountToTransfer] as LadleActions.Args.TRANSFER,
@@ -161,7 +183,7 @@ export const useRepayDebt = () => {
       },
       {
         operation: LadleActions.Fn.REPAY_VAULT,
-        args: [vault.id, reclaimToAddress, _collateralToRemove, _input] as LadleActions.Args.REPAY_VAULT,
+        args: [vault.id, reclaimToAddress(), _collateralToRemove, _input] as LadleActions.Args.REPAY_VAULT,
         ignoreIf:
           series.seriesIsMature ||
           !inputGreaterThanEqualDebt || // ie ignore if use if input IS NOT more than debt
@@ -171,18 +193,18 @@ export const useRepayDebt = () => {
       /* EdgeCase in lowLiq situations : Input GreaterThanMaxbaseIn ( user incurs a penalty because repaid at 1:1 ) */
       {
         operation: LadleActions.Fn.CLOSE,
-        args: [vault.id, reclaimToAddress, _collateralToRemove, _inputCappedAtArt.mul(-1)] as LadleActions.Args.CLOSE,
+        args: [vault.id, reclaimToAddress(), _collateralToRemove, _inputCappedAtArt.mul(-1)] as LadleActions.Args.CLOSE,
         ignoreIf: series.seriesIsMature || !tradeIsNotPossible, // (ie. ignore if trade IS possible )
       },
 
       /* AFTER MATURITY  - series.seriesIsMature */
       {
         operation: LadleActions.Fn.CLOSE,
-        args: [vault.id, reclaimToAddress, _collateralToRemove, _inputCappedAtArt.mul(-1)] as LadleActions.Args.CLOSE,
+        args: [vault.id, reclaimToAddress(), _collateralToRemove, _inputCappedAtArt.mul(-1)] as LadleActions.Args.CLOSE,
         ignoreIf: !series.seriesIsMature,
       },
-
-      ...removeEth(isEthCollateral ? ONE_BN : ZERO_BN), // after the complete tranasction, this will remove all the ETH collateral (if requested). (exit_ether sweeps all the eth out of the ladle, so exact amount is not importnat -> just greater than zero)
+      ...removeEthCallData,
+      ...unwrapAssetCallData,
     ];
     await transact(calls, txCode);
     updateVaults([vault]);
diff --git a/src/hooks/actionHooks/useRollPosition.ts b/src/hooks/actionHooks/useRollPosition.ts
index 8d7459601..5a8ac22dd 100644
--- a/src/hooks/actionHooks/useRollPosition.ts
+++ b/src/hooks/actionHooks/useRollPosition.ts
@@ -4,29 +4,40 @@ import { ChainContext } from '../../contexts/ChainContext';
 import { HistoryContext } from '../../contexts/HistoryContext';
 import { SettingsContext } from '../../contexts/SettingsContext';
 import { UserContext } from '../../contexts/UserContext';
-import { ICallData, ISeries, ActionCodes, LadleActions, RoutedActions, IUserContext, IUserContextActions, IUserContextState, IAsset } from '../../types';
+import {
+  ICallData,
+  ISeries,
+  ActionCodes,
+  LadleActions,
+  RoutedActions,
+  IUserContext,
+  IUserContextActions,
+  IUserContextState,
+  IAsset,
+} from '../../types';
 import { cleanValue, getTxCode } from '../../utils/appUtils';
 import { buyBase, calculateSlippage } from '../../utils/yieldMath';
 import { useChain } from '../useChain';
 
 /* Lend Actions Hook */
 export const useRollPosition = () => {
-
   const {
-    settingsState: { slippageTolerance, approveMax },
+    settingsState: { slippageTolerance },
   } = useContext(SettingsContext);
-  
+
   const {
     chainState: { contractMap },
   } = useContext(ChainContext);
 
-    const { userState, userActions }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
+  const { userState, userActions }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
     UserContext
-  ) as IUserContext;;
+  ) as IUserContext;
   const { activeAccount: account, assetMap } = userState;
   const { updateSeries, updateAssets } = userActions;
 
-  const { historyActions: { updateTradeHistory } } = useContext(HistoryContext);
+  const {
+    historyActions: { updateTradeHistory },
+  } = useContext(HistoryContext);
 
   const { sign, transact } = useChain();
 
@@ -51,34 +62,35 @@ export const useRollPosition = () => {
           fromSeries.decimals
         );
 
-    console.log( _fyTokenValueOfInput.toString());
+    console.log(_fyTokenValueOfInput.toString());
 
     const _minimumFYTokenReceived = calculateSlippage(_fyTokenValueOfInput, slippageTolerance.toString(), true);
+    const alreadyApproved = (await fromSeries.fyTokenContract.allowance(account!, ladleAddress)).gte(_input);
 
-    const alreadyApproved = (await fromSeries.fyTokenContract.allowance(account!, ladleAddress) ).gte(_input);
-
-    const permits: ICallData[] = await sign(
+    const permitCallData: ICallData[] = await sign(
       [
         {
           target: fromSeries,
           spender: 'LADLE',
           amount: _fyTokenValueOfInput,
-          ignoreIf: alreadyApproved===true,
+          ignoreIf: alreadyApproved === true,
         },
       ],
       txCode
     );
 
+    /* Reciever of transfer (based on maturity) the series maturity */
+    const transferToAddress = () => {
+      if (fromSeries.seriesIsMature) return fromSeries.fyTokenAddress;
+      return fromSeries.poolAddress;
+    };
+
     const calls: ICallData[] = [
-      ...permits,
+      ...permitCallData,
 
       {
         operation: LadleActions.Fn.TRANSFER,
-        args: [
-          fromSeries.fyTokenAddress, 
-          fromSeries.seriesIsMature ? fromSeries.fyTokenAddress : fromSeries.poolAddress,  // mature/not
-          _fyTokenValueOfInput
-        ] as LadleActions.Args.TRANSFER,
+        args: [fromSeries.fyTokenAddress, transferToAddress(), _fyTokenValueOfInput] as LadleActions.Args.TRANSFER,
         ignoreIf: false, // never ignore
       },
 
diff --git a/src/hooks/actionHooks/useVaultAdmin.ts b/src/hooks/actionHooks/useVaultAdmin.ts
deleted file mode 100644
index a15ab11da..000000000
--- a/src/hooks/actionHooks/useVaultAdmin.ts
+++ /dev/null
@@ -1,101 +0,0 @@
-import { ethers } from 'ethers';
-import { useContext } from 'react';
-import { ChainContext } from '../../contexts/ChainContext';
-import { SettingsContext } from '../../contexts/SettingsContext';
-import { UserContext } from '../../contexts/UserContext';
-import {
-  ICallData,
-  IVault,
-  ActionCodes,
-  LadleActions,
-  ISettingsContext,
-  IUserContext,
-  IUserContextActions,
-  IUserContextState,
-  IAsset,
-  ISeries,
-} from '../../types';
-import { getTxCode } from '../../utils/appUtils';
-import { useChain } from '../useChain';
-
-/* Generic hook for chain transactions */
-export const useVaultAdmin = () => {
-  const { userState, userActions }: { userState: IUserContextState; userActions: IUserContextActions } = useContext(
-    UserContext
-  ) as IUserContext;
-  const { activeAccount: account, seriesMap, assetMap } = userState;
-  const { updateVaults } = userActions;
-
-  const {
-    chainState: { contractMap },
-  } = useContext(ChainContext);
-
-  const {
-    settingsState: { approveMax },
-  } = useContext(SettingsContext) as ISettingsContext;
-
-  const { sign, transact } = useChain();
-
-  const transfer = async (vault: IVault, to: string) => {
-    const txCode = getTxCode(ActionCodes.TRANSFER_VAULT, vault.id);
-    const series: ISeries = seriesMap.get(vault.seriesId)!;
-    const base: IAsset = assetMap.get(vault.baseId)!;
-    const ladleAddress = contractMap.get('Ladle').address;
-
-    const alreadyApproved = approveMax
-      ? (await base.getAllowance(account!, ladleAddress)).gte(vault.accruedArt)
-      : false;
-
-    const permits: ICallData[] = await sign(
-      [
-        {
-          target: base,
-          spender: 'LADLE',
-          message: 'Signing Dai Approval',
-          ignoreIf: series.seriesIsMature || alreadyApproved === true,
-        },
-      ],
-      txCode
-    );
-
-    const calls: ICallData[] = [
-      ...permits,
-      {
-        operation: LadleActions.Fn.GIVE,
-        args: [vault.id, to] as LadleActions.Args.GIVE,
-        ignoreIf: series.seriesIsMature,
-      },
-    ];
-
-    await transact(calls, txCode);
-    updateVaults([]);
-  };
-
-  const merge = async (vault: IVault, to: IVault, ink: string, art: string, deleteVault: boolean = false) => {
-    const txCode = getTxCode(ActionCodes.MERGE_VAULT, vault.id);
-    const series = seriesMap.get(vault.seriesId);
-
-    /* ladle.stir(fromVault, toVault, ink, art) */
-    const calls: ICallData[] = [
-      {
-        operation: LadleActions.Fn.STIR,
-        args: [vault.id, to.id, vault.ink, vault.accruedArt] as LadleActions.Args.STIR,
-        // TODO: #82 refactor to actually allow for custom ink and art values (right now seems like formatting issues) @marcomariscal
-        // args: [vault.id, to.id, _ink, _art] as LadleActions.Args.STIR,
-        ignoreIf: series?.seriesIsMature,
-      },
-      {
-        operation: LadleActions.Fn.DESTROY,
-        args: [vault.id] as LadleActions.Args.DESTROY,
-        ignoreIf: !deleteVault || vault.accruedArt.gt(ethers.constants.Zero) || vault.ink.gt(ethers.constants.Zero),
-      },
-    ];
-    await transact(calls, txCode);
-    updateVaults([]);
-  };
-
-  return {
-    transfer,
-    merge,
-  };
-};
diff --git a/src/hooks/actionHooks/useWrapUnwrapAsset.ts b/src/hooks/actionHooks/useWrapUnwrapAsset.ts
index 37994b4be..734250c4e 100644
--- a/src/hooks/actionHooks/useWrapUnwrapAsset.ts
+++ b/src/hooks/actionHooks/useWrapUnwrapAsset.ts
@@ -2,41 +2,53 @@ import { BigNumber, Contract } from 'ethers';
 import { useContext } from 'react';
 import { ChainContext } from '../../contexts/ChainContext';
 import { SettingsContext } from '../../contexts/SettingsContext';
-import { ICallData, LadleActions, IAsset, RoutedActions } from '../../types';
-import { MAX_256, ZERO_BN } from '../../utils/constants';
+import { ICallData, LadleActions, IAsset, RoutedActions, IChainContext, ISettingsContext } from '../../types';
+import { ZERO_BN } from '../../utils/constants';
 import { useChain } from '../useChain';
 
 export const useWrapUnwrapAsset = () => {
   const {
     chainState: {
-      connection: { account, provider },
+      connection: { account, provider, chainId },
       contractMap,
       assetRootMap,
     },
-  } = useContext(ChainContext);
+  } = useContext(ChainContext) as IChainContext;
 
   const {
     settingsState: { unwrapTokens, diagnostics },
-  } = useContext(SettingsContext);
+  } = useContext(SettingsContext) as ISettingsContext;
 
   const signer = account ? provider?.getSigner(account) : provider?.getSigner(0);
   const { sign } = useChain();
 
   const wrapHandlerAbi = ['function wrap(address to)', 'function unwrap(address to)'];
 
-  const wrapAssetToJoin = async (value: BigNumber, asset: IAsset, txCode: string): Promise<ICallData[]> => {
+  const wrapAsset = async (
+    value: BigNumber,
+    asset: IAsset,
+    txCode: string,
+    to?: string | undefined // optional send destination : DEFAULT is assetJoin address
+  ): Promise<ICallData[]> => {
     const ladleAddress = contractMap.get('Ladle').address;
+    /* SET the destination address DEFAULTs to the assetJoin Address */
+    const toAddress = to || asset.joinAddress;
+    const wrapHandlerAddress = asset.wrapHandlerAddresses?.has(chainId)
+      ? asset.wrapHandlerAddresses.get(chainId)
+      : undefined;
 
-    if (!asset.isWrappedToken && asset.wrappedTokenId && asset.wrapHandlerAddress && value.gt(ZERO_BN)) {
-      const wraphandlerContract: Contract = new Contract(asset.wrapHandlerAddress, wrapHandlerAbi, signer);
-      const unwrappedAssetContract = assetRootMap.get(asset.id);
-      diagnostics && console.log('Asset Contract to be signed for wrapping: ', unwrappedAssetContract);
+    /* NB! IF a wraphandler exists, we assume that it is Yield uses the wrapped version of the token */
+    if (wrapHandlerAddress && value.gt(ZERO_BN)) {
+      const wrapHandlerContract: Contract = new Contract(wrapHandlerAddress, wrapHandlerAbi, signer);
+      const { assetContract } = assetRootMap.get(asset.id); // note -> this is NOT the proxyID
+
+      diagnostics && console.log('Asset Contract to be signed for wrapping: ', assetContract.id);
 
       /* Gather all the required signatures - sign() processes them and returns them as ICallData types */
-      const permit: ICallData[] = await sign(
+      const permitCallData: ICallData[] = await sign(
         [
           {
-            target: unwrappedAssetContract, // full target contract
+            target: asset, // full target contract
             spender: ladleAddress,
             amount: value,
             ignoreIf: false,
@@ -46,44 +58,50 @@ export const useWrapUnwrapAsset = () => {
       );
 
       return [
-        ...permit,
+        ...permitCallData,
         {
           operation: LadleActions.Fn.TRANSFER,
-          args: [asset.address, asset.wrapHandlerAddress, value] as LadleActions.Args.TRANSFER,
+          args: [asset.address, wrapHandlerAddress, value] as LadleActions.Args.TRANSFER,
           ignoreIf: false,
         },
         {
           operation: LadleActions.Fn.ROUTE,
-          args: [asset.joinAddress] as RoutedActions.Args.WRAP,
+          args: [toAddress] as RoutedActions.Args.WRAP,
           fnName: RoutedActions.Fn.WRAP,
-          targetContract: wraphandlerContract,
+          targetContract: wrapHandlerContract,
           ignoreIf: false,
         },
       ];
     }
-    /* else  if not a wrapped asset simply return empty array */
+    /* else if not a wrapped asset, (or value is 0) simply return empty array */
     return [];
   };
 
   const unwrapAsset = async (asset: IAsset, receiver: string): Promise<ICallData[]> => {
-    if (unwrapTokens && asset.wrapHandlerAddress) {
+    const unwrapHandlerAddress = asset.unwrapHandlerAddresses.has(chainId)
+      ? asset.unwrapHandlerAddresses.get(chainId)
+      : undefined;
+
+    /* if there is an unwrap handler we assume the token needs to be unwrapped  ( unless the 'unwrapTokens' setting is false) */
+    if (unwrapTokens && unwrapHandlerAddress) {
       diagnostics && console.log('Unwrapping tokens before return');
-      const wraphandlerContract: Contract = new Contract(asset.wrapHandlerAddress, wrapHandlerAbi, signer);
+      const unwraphandlerContract: Contract = new Contract(unwrapHandlerAddress, wrapHandlerAbi, signer);
 
       return [
         {
           operation: LadleActions.Fn.ROUTE,
           args: [receiver] as RoutedActions.Args.UNWRAP,
           fnName: RoutedActions.Fn.UNWRAP,
-          targetContract: wraphandlerContract,
+          targetContract: unwraphandlerContract,
           ignoreIf: false,
         },
       ];
     }
+
     /* else return empty array */
     diagnostics && console.log('NOT unwrapping tokens before return');
     return [];
   };
 
-  return { wrapAssetToJoin, unwrapAsset };
+  return { wrapAsset, unwrapAsset };
 };
diff --git a/src/hooks/useApr.ts b/src/hooks/useApr.ts
index e2cfae5ff..9b026c8a7 100644
--- a/src/hooks/useApr.ts
+++ b/src/hooks/useApr.ts
@@ -48,11 +48,11 @@ export const useApr = (input: string | undefined, actionType: ActionType, series
       const _apr = calculateAPR(baseAmount, preview, _selectedSeries?.maturity);
       _apr ? setApr(cleanValue(_apr, 2)) : setApr(_selectedSeries.apr);
     }
-  }, [_selectedSeries, _input, actionType]);
+  }, [_selectedSeries, _input, actionType, _fallbackInput]);
 
   /* Get the min APR from all the series */
   const aprArray = Array.from(seriesMap.values())
-    .filter((x: ISeries) => x.baseId === selectedBase?.idToUse)
+    .filter((x: ISeries) => x.baseId === selectedBase?.proxyId)
     .map((x: ISeries) => parseFloat(x.apr));
   const minApr = aprArray.length && Math.min(...aprArray);
   const maxApr = aprArray.length && Math.min(...aprArray);
diff --git a/src/hooks/useAssetPair.ts b/src/hooks/useAssetPair.ts
index 8bdeafc13..932c18568 100644
--- a/src/hooks/useAssetPair.ts
+++ b/src/hooks/useAssetPair.ts
@@ -15,10 +15,10 @@ export const useAssetPair = (base?: IAsset, collateral?: IAsset): IAssetPair | u
 
   useEffect(() => {
     if (base && collateral) {
-      pairMap.has(base.id + collateral.id) && setAssetPair(pairMap.get(base.id + collateral.id));
-      !pairMap.has(base.id + collateral.id) &&
-        !pairLoading.includes(base.id + collateral.id) &&
-        updateAssetPair(base.id, collateral.id);
+      pairMap.has(base.proxyId + collateral.proxyId) && setAssetPair(pairMap.get(base.proxyId + collateral.proxyId));
+      !pairMap.has(base.proxyId + collateral.proxyId) &&
+        !pairLoading.includes(base.proxyId + collateral.proxyId) &&
+        updateAssetPair(base.proxyId, collateral.proxyId);
     }
   }, [base, collateral, pairMap, pairLoading]);
 
diff --git a/src/hooks/useChain.ts b/src/hooks/useChain.ts
index 88b0fd394..5826630c0 100644
--- a/src/hooks/useChain.ts
+++ b/src/hooks/useChain.ts
@@ -4,11 +4,9 @@ import { useContext } from 'react';
 import { ChainContext } from '../contexts/ChainContext';
 import { TxContext } from '../contexts/TxContext';
 
-import { ApprovalType, ICallData, ISettingsContext, ISignData, LadleActions } from '../types';
+import { ApprovalType, ICallData, ISettingsContext, ISignData, LadleActions, TokenType } from '../types';
 import { MAX_256, ZERO_BN } from '../utils/constants';
 
-import { DAI_PERMIT_ASSETS, NON_PERMIT_ASSETS } from '../config/assets';
-
 import { ERC1155__factory, ERC20Permit__factory, Ladle } from '../contracts';
 import { useApprovalMethod } from './useApprovalMethod';
 import { SettingsContext } from '../contexts/SettingsContext';
@@ -97,8 +95,8 @@ export const useChain = () => {
       console.log('Auto gas estimate:', gasEst.mul(120).div(100).toString());
     } catch (e: any) {
       gasEst = BigNumber.from(500000);
-       /* handle if the tx if going to fail and transactions aren't forced */
-      if (!forceTransactions) return handleTxWillFail(e.error, txCode, e.transaction)
+      /* handle if the tx if going to fail and transactions aren't forced */
+      if (!forceTransactions) return handleTxWillFail(e.error, txCode, e.transaction);
     }
 
     /* Finally, send out the transaction */
@@ -144,7 +142,8 @@ export const useChain = () => {
         diagnostics && console.log('Sign: Amount', _amount?.toString());
 
         /* Request the signature if using DaiType permit style */
-        if (DAI_PERMIT_ASSETS.includes(reqSig.target.symbol) && chainId !== 42161) {
+        if (reqSig.target.tokenType === TokenType.ERC20_DaiPermit && chainId !== 42161) {
+          // dai in arbitrum uses regular permits
           const { v, r, s, nonce, expiry, allowed } = await handleSign(
             /* We are pass over the generated signFn and sigData to the signatureHandler for tracking/tracing/fallback handling */
             () =>
@@ -222,7 +221,12 @@ export const useChain = () => {
               true
             ),
           txCode,
-          NON_PERMIT_ASSETS.includes(reqSig.target.symbol) ? ApprovalType.TX : approvalMethod
+
+          reqSig.target.tokenType === TokenType.ERC20_DaiPermit ||
+            reqSig.target.tokenType === TokenType.ERC20_Permit ||
+            !reqSig.target.tokenType // handle fyTokens (don't have an explicit tokenType in the asset config)
+            ? approvalMethod
+            : ApprovalType.TX
         );
 
         const args = [
diff --git a/src/hooks/viewHelperHooks/usePoolHelpers.ts b/src/hooks/viewHelperHooks/usePoolHelpers.ts
index bdb431266..e251ef37a 100644
--- a/src/hooks/viewHelperHooks/usePoolHelpers.ts
+++ b/src/hooks/viewHelperHooks/usePoolHelpers.ts
@@ -32,7 +32,7 @@ export const usePoolHelpers = (input: string | undefined, removeLiquidityView: b
     selectedStrategy ? strategy?.currentSeriesId : selectedSeries
   );
 
-  const strategyBase: IAsset | undefined = assetMap?.get(selectedStrategy ? strategy?.baseId : selectedBase?.idToUse);
+  const strategyBase: IAsset | undefined = assetMap?.get(selectedStrategy ? strategy?.baseId : selectedBase?.proxyId);
 
   /* LOCAL STATE */
 
@@ -72,8 +72,8 @@ export const usePoolHelpers = (input: string | undefined, removeLiquidityView: b
         .sort((vaultA: IVault, vaultB: IVault) => (vaultA.art.lt(vaultB.art) ? 1 : -1))
         .find(
           (v: IVault) =>
-            v.ilkId === strategyBase.idToUse &&
-            v.baseId === strategyBase.idToUse &&
+            v.ilkId === strategyBase.proxyId &&
+            v.baseId === strategyBase.proxyId &&
             v.seriesId === strategySeries.id &&
             v.isActive
         );
@@ -315,6 +315,5 @@ export const usePoolHelpers = (input: string | undefined, removeLiquidityView: b
     removeFyTokenReceived,
     removeBaseReceived_,
     removeFyTokenReceived_,
-
   };
 };
diff --git a/src/types/index.ts b/src/types/index.ts
index 7c2fb4196..0eb28e8ab 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -1,5 +1,5 @@
 import { ethers, BigNumber, BigNumberish, ContractTransaction, Contract } from 'ethers';
-import { ERC1155, ERC20, ERC20Permit, FYToken, Pool, Strategy } from '../contracts';
+import { FYToken, Pool, Strategy } from '../contracts';
 
 export { LadleActions, RoutedActions } from './operations';
 
@@ -132,6 +132,7 @@ export interface ISignable {
   version: string;
   address: string;
   symbol: string;
+  tokenType: TokenType;
 }
 
 export interface ISeriesRoot extends ISignable {
@@ -184,29 +185,23 @@ export enum TokenType {
 
 export interface IAssetInfo {
   tokenType: TokenType;
-  tokenIdentifier?: number; // used for identifying tokens in a multitoken contract
+  tokenIdentifier?: number | string; // used for identifying tokens in a multitoken contract
 
   name: string;
   version: string;
   symbol: string;
   decimals: number;
 
-  showToken: boolean;
-  isWrappedToken: boolean; // Note: this is if it a token wrapped by the yield protocol (except ETH - which is handled differently)
+  showToken: boolean; // Display/hide the token on the UI
 
   digitFormat: number; // this is the 'reasonable' number of digits to show. accuracy equivalent to +- 1 us cent.
-
   displaySymbol?: string; // override for symbol display
 
-  wrapHandlerAddress?: string;
-
-  wrappedTokenId?: string;
-  wrappedTokenAddress?: string;
-
-  unwrappedTokenId?: string;
-  unwrappedTokenAddress?: string;
-
   limitToSeries?: string[];
+
+  wrapHandlerAddresses?: Map<number, string>; // mapping a chain id to the corresponding wrap handler address
+  unwrapHandlerAddresses?: Map<number, string>; // mapping a chain id to the correpsonding unwrap handler address
+  proxyId?: string;
 }
 
 export interface IAssetRoot extends IAssetInfo, ISignable {
@@ -219,10 +214,13 @@ export interface IAssetRoot extends IAssetInfo, ISignable {
   joinAddress: string;
 
   digitFormat: number;
-  baseContract: Contract;
+  assetContract: Contract;
 
   isYieldBase: boolean;
-  idToUse: string;
+
+  isWrappedToken: boolean; // Note: this is if is a token used in wrapped form by the yield protocol (except ETH - which is handled differently)
+  wrappingRequired: boolean;
+  proxyId: string; // id to use throughout app when referencing an asset id; uses the unwrapped asset id when the asset is wrapped (i.e: wstETH is the proxy id for stETH)
 
   // baked in token fns
   getBalance: (account: string) => Promise<BigNumber>;
@@ -233,14 +231,12 @@ export interface IAssetRoot extends IAssetInfo, ISignable {
 export interface IAssetPair {
   baseId: string;
   ilkId: string;
-
   oracle: string;
 
   baseDecimals: number;
   limitDecimals: number;
 
   minRatio: number;
-
   minDebtLimit: BigNumber;
   maxDebtLimit: BigNumber;
   pairPrice: BigNumber;
@@ -392,12 +388,7 @@ export interface IDomain {
 export enum ApprovalType {
   TX = 'TX',
   SIG = 'SIG',
-}
-
-export enum SignType {
-  ERC2612 = 'ERC2612_TYPE',
-  DAI = 'DAI_TYPE',
-  FYTOKEN = 'FYTOKEN_TYPE',
+  DAI_SIG = 'DAI_SIG',
 }
 
 export enum TxState {
diff --git a/src/types/operations.ts b/src/types/operations.ts
index c7d902ca8..022e66b5a 100644
--- a/src/types/operations.ts
+++ b/src/types/operations.ts
@@ -112,7 +112,6 @@ export namespace RoutedActions {
       maxRatio: BigNumberish
     ];
     export type BURN_FOR_BASE = [receiver: string, minRatio: BigNumberish, maxRatio: BigNumberish];
-
     export type MINT_STRATEGY_TOKENS = [receiver: string];
     export type BURN_STRATEGY_TOKENS = [receiver: string];