diff --git a/TODO.json b/TODO.json
new file mode 100644
index 00000000..3449044c
--- /dev/null
+++ b/TODO.json
@@ -0,0 +1,46 @@
+{
+  "groups": [
+    {
+      "code": "balanceAlerts",
+      "fields": [
+        "cashInAlertThreshold"
+      ]
+    },
+    {
+      "code": "compliance",
+      "fields": [
+         "smsVerificationActive",
+         "smsVerificationThreshold",
+         "idCardDataVerificationActive",
+         "idCardDataVerificationThreshold",
+         "idCardPhotoVerificationActive",
+         "idCardPhotoVerificationThreshold",
+         "sanctionsVerificationActive",
+         "sanctionsVerificationThreshold",
+         "frontCameraVerificationActive",
+         "frontCameraVerificationThreshold",
+         "hardLimitVerificationActive",
+         "hardLimitVerificationThreshold",
+         "receiptPrintingActive",
+         "rejectAddressReuseActive"
+      ]
+    },
+    {
+      "code": "walletSettings",
+      "fields": [
+        "ticker",
+        "wallet",
+        "layer2",
+        "exchange",
+        "zeroConf"
+      ]
+    },
+    {
+      "code": "notifications",
+      "fields": [
+        "sms",
+        "email"
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/lib/new-admin/transactions.js b/lib/new-admin/transactions.js
index 57131786..249722aa 100644
--- a/lib/new-admin/transactions.js
+++ b/lib/new-admin/transactions.js
@@ -62,7 +62,10 @@ function batch () {
 }
 
 function getCustomerTransactions (customerId) {
-  const packager = _.flow(_.flatten, _.orderBy(_.property('created'), ['desc']),
+  const packager = _.flow(it => {
+    console.log()
+    return it
+  }, _.flatten, _.orderBy(_.property('created'), ['desc']),
     _.take(NUM_RESULTS), _.map(camelize), addNames)
 
   const cashInSql = `select 'cashIn' as tx_class, txs.*,
diff --git a/lib/plugins.js b/lib/plugins.js
index f128f2a2..aa06b197 100644
--- a/lib/plugins.js
+++ b/lib/plugins.js
@@ -185,6 +185,7 @@ function plugins (settings, deviceId) {
     const commissions = configManager.getCommissions(cryptoCode, deviceId, settings.config)
     const minimumTx = BN(commissions.minimumTx)
     const cashInFee = BN(commissions.fixedFee)
+    logger.info('FEE', cashInFee)
     const cashInCommission = BN(commissions.cashIn)
     const cashOutCommission = _.isNumber(commissions.cashOut) ? BN(commissions.cashOut) : null
     const cryptoRec = coinUtils.getCryptoCurrency(cryptoCode)
diff --git a/new-lamassu-admin/src/components/fake-table/Table.js b/new-lamassu-admin/src/components/fake-table/Table.js
index e7e2a368..2ceaee30 100644
--- a/new-lamassu-admin/src/components/fake-table/Table.js
+++ b/new-lamassu-admin/src/components/fake-table/Table.js
@@ -76,7 +76,7 @@ const ThDoubleLevel = ({ title, children, className }) => {
   )
 }
 
-const Tr = ({ error, errorMessage, children, className, size }) => {
+const Tr = ({ onClick, error, errorMessage, children, className, size }) => {
   const classes = useStyles({ size })
   const cardClasses = { root: classes.cardContentRoot }
   const classNames = {
@@ -88,7 +88,7 @@ const Tr = ({ error, errorMessage, children, className, size }) => {
 
   return (
     <>
-      <Card className={classnames(classNames, className)}>
+      <Card className={classnames(classNames, className)} onClick={onClick}>
         <CardContent classes={cardClasses}>
           <div className={classes.mainContent}>{children}</div>
           {error && <div className={classes.errorContent}>{errorMessage}</div>}
diff --git a/new-lamassu-admin/src/components/fake-table/Table.styles.js b/new-lamassu-admin/src/components/fake-table/Table.styles.js
index 05498e4a..bc459a5c 100644
--- a/new-lamassu-admin/src/components/fake-table/Table.styles.js
+++ b/new-lamassu-admin/src/components/fake-table/Table.styles.js
@@ -91,7 +91,7 @@ export default {
     '&:before': {
       height: 0
     },
-    margin: [[4, 0]],
+    margin: [[4, 0, 0, 0]],
     width: '100%',
     boxShadow: [[0, 0, 4, 0, 'rgba(0, 0, 0, 0.08)']]
   },
diff --git a/new-lamassu-admin/src/components/tables/DataTable.js b/new-lamassu-admin/src/components/tables/DataTable.js
index dcb8f91b..0da307e0 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.js
@@ -38,36 +38,49 @@ const Row = ({
 }) => {
   const classes = useStyles()
 
+  const hasPointer = onClick || expandable
+  const trClasses = {
+    [classes.pointer]: hasPointer,
+    [classes.row]: true,
+    [classes.expanded]: expanded
+  }
+
   return (
-    <div
-      style={onClick && { cursor: 'pointer' }}
-      onClick={() => onClick && onClick(data)}>
-      <Tr
-        className={classnames(classes.row)}
-        error={data.error}
-        errorMessage={data.errorMessage}>
-        {elements.map(({ view = it => it?.toString(), ...props }, idx) => (
-          <Td key={idx} {...props}>
-            {view(data)}
-          </Td>
-        ))}
-        {expandable && (
-          <Td width={expWidth} textAlign="center">
-            <button
-              onClick={() => expandRow(id)}
-              className={classes.expandButton}>
-              {expanded && <ExpandOpenIcon />}
-              {!expanded && <ExpandClosedIcon />}
-            </button>
-          </Td>
-        )}
-      </Tr>
-      {expandable && expanded && (
-        <Tr className={classes.detailsRow}>
-          <Td width={width}>
-            <Details it={data} />
-          </Td>
+    <div>
+      <div className={classnames({ [classes.before]: expanded })}>
+        <Tr
+          className={classnames(trClasses)}
+          onClick={() => {
+            expandable && expandRow(id)
+            onClick && onClick(data)
+          }}
+          error={data.error}
+          errorMessage={data.errorMessage}>
+          {elements.map(({ view = it => it?.toString(), ...props }, idx) => (
+            <Td key={idx} {...props}>
+              {view(data)}
+            </Td>
+          ))}
+          {expandable && (
+            <Td width={expWidth} textAlign="center">
+              <button
+                onClick={() => expandRow(id)}
+                className={classes.expandButton}>
+                {expanded && <ExpandOpenIcon />}
+                {!expanded && <ExpandClosedIcon />}
+              </button>
+            </Td>
+          )}
         </Tr>
+      </div>
+      {expandable && expanded && (
+        <div className={classes.after}>
+          <Tr className={classnames({ [classes.expanded]: expanded })}>
+            <Td width={width}>
+              <Details it={data} />
+            </Td>
+          </Tr>
+        </div>
       )}
     </div>
   )
diff --git a/new-lamassu-admin/src/components/tables/DataTable.styles.js b/new-lamassu-admin/src/components/tables/DataTable.styles.js
index dc0e3e58..6c5dbc58 100644
--- a/new-lamassu-admin/src/components/tables/DataTable.styles.js
+++ b/new-lamassu-admin/src/components/tables/DataTable.styles.js
@@ -1,3 +1,5 @@
+import { zircon } from 'src/styling/variables'
+
 export default {
   expandButton: {
     border: 'none',
@@ -8,6 +10,19 @@ export default {
   row: {
     borderRadius: 0
   },
+  expanded: {
+    border: [[2, 'solid', zircon]],
+    boxShadow: '0 0 8px 0 rgba(0,0,0,0.08)'
+  },
+  before: {
+    paddingTop: 12
+  },
+  after: {
+    paddingBottom: 12
+  },
+  pointer: {
+    cursor: 'pointer'
+  },
   body: {
     flex: [[1, 1, 'auto']]
   },
diff --git a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
index 0ec9694d..c19b9b20 100644
--- a/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
+++ b/new-lamassu-admin/src/pages/Transactions/DetailsCard.js
@@ -39,10 +39,7 @@ const DetailsRow = ({ it: tx, ...props }) => {
     5
   )
   const commissionPercentage = Number.parseFloat(tx.commissionPercentage, 2)
-  const commission =
-    tx.txClass === 'cashOut'
-      ? fiat * commissionPercentage
-      : fiat * commissionPercentage + Number.parseFloat(tx.fee)
+  const commission = fiat * commissionPercentage
   const customer = tx.customerIdCardData && {
     name: `${onlyFirstToUpper(
       tx.customerIdCardData.firstName
@@ -163,6 +160,12 @@ const DetailsRow = ({ it: tx, ...props }) => {
                     100} %)`}
                 </div>
               </div>
+              {tx.txClass === 'cashIn' && (
+                <div className={classes.innerRow}>
+                  <Label>Fixed fee</Label>
+                  <div>{Number.parseFloat(tx.cashInFee)}</div>
+                </div>
+              )}
             </div>
           </div>
           <div className={classnames(classes.col, classes.col3)}>
diff --git a/new-lamassu-admin/src/pages/Transactions/Transactions.js b/new-lamassu-admin/src/pages/Transactions/Transactions.js
index 50e84533..bed3fa4b 100644
--- a/new-lamassu-admin/src/pages/Transactions/Transactions.js
+++ b/new-lamassu-admin/src/pages/Transactions/Transactions.js
@@ -33,7 +33,7 @@ const GET_TRANSACTIONS = gql`
       machineName
       deviceId
       fiat
-      fee
+      cashInFee
       fiatCode
       cryptoAtoms
       cryptoCode
diff --git a/new-lamassu-admin/todo.md b/new-lamassu-admin/todo.md
new file mode 100644
index 00000000..24027d7c
--- /dev/null
+++ b/new-lamassu-admin/todo.md
@@ -0,0 +1,41 @@
+UI:
+- Large input fields wiggle on editable table edit/non-edit mode change.
+- all (machines/coins/...) should be a option on some overrides
+
+Compliance: 
+- Reject Address Reuse missing
+
+CoinATMRadar:
+- We now have photo, should we relay that info?
+
+Locale:
+- should we show the user wallet needs to be configured after adding in a new coin?
+- check if coin is active before considering it active on other screens
+
+Commission:
+- overrides can be tighter. Hide coins already used by the same machine on another line.
+
+Sms/email:
+- There's no place to pick a third party provider anymore.
+
+Cashout:
+- I've just added a zero conf limit column. Should it be like this?
+
+Notifications:
+- cashInAlertThreshold missing, used to warn to full cashbox
+
+Machine name:
+- Previously we were grabbing that from the config, but since new admin still cant change the name i`m now grabbing it from the db. Possible issues if users change the machine name from the initial one. Investivate alternatives.
+
+Migrate:
+- Need to write config migration. 
+- Rewrite config validate
+- remove apply defaults
+
+Compliance:
+- Currently admin only handles { type: 'volume', direction: 'both' }
+- Sanctions should have more care in customers.js, currently just looking if is active as if old config
+
+Other stuff:
+- sms.js
+- email.js
\ No newline at end of file
diff --git a/test/fixtures/new-settings.json b/test/fixtures/new-settings.json
new file mode 100644
index 00000000..58f51f7d
--- /dev/null
+++ b/test/fixtures/new-settings.json
@@ -0,0 +1,139 @@
+{
+  "config": {
+    "triggers": [
+      {
+        "id": "ce8f240f-7235-4948-b833-4af56ccfa90f",
+        "cashDirection": "cash-out",
+        "triggerType": "volume",
+        "threshold": "12",
+        "requirement": "block"
+      }
+    ],
+    "denominations_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_bottom": 12,
+    "denominations_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_top": 12,
+    "denominations_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_active": true,
+    "locale_country": "US",
+    "locale_fiatCurrency": "USD",
+    "locale_languages": [
+      "en-US"
+    ],
+    "locale_cryptoCurrencies": [
+      "BTC"
+    ],
+    "commissions_minimumTx": 12,
+    "commissions_fixedFee": 12,
+    "commissions_cashOut": 12,
+    "commissions_cashIn": 12,
+    "operatorInfo_companyNumber": "123",
+    "operatorInfo_website": "123",
+    "operatorInfo_email": "123@gmail.com",
+    "operatorInfo_phone": "123",
+    "operatorInfo_name": "123",
+    "operatorInfo_active": true,
+    "receiptPrinting": {
+      "active": "on",
+      "operatorWebsite": true,
+      "operatorEmail": false,
+      "operatorPhone": false,
+      "companyRegistration": false,
+      "machineLocation": true,
+      "customerNameOrPhoneNumber": true,
+      "exchangeRate": false,
+      "addressQRCode": true
+    },
+    "coinAtmRadar_active": true,
+    "coinAtmRadar_commissions": true,
+    "coinAtmRadar_supportedCryptocurrencies": true,
+    "coinAtmRadar_supportedFiat": true,
+    "coinAtmRadar_supportedBuySellDirection": true,
+    "coinAtmRadar_limitsAndVerification": true,
+    "termsConditions_active": true,
+    "termsConditions_title": "Rasdkl",
+    "termsConditions_text": "123oh12",
+    "termsConditions_acceptButtonText": "op1i2jh3po",
+    "termsConditions_cancelButtonText": "12341",
+    "wallets_BTC_active": true,
+    "wallets_BTC_ticker": "mock-ticker",
+    "wallets_BTC_wallet": "mock-wallet",
+    "wallets_BTC_exchange": "mock-exchange",
+    "wallets_BTC_zeroConf": "mock-zero-conf",
+    "commissions_overrides": [
+      {
+        "minimumTx": 33,
+        "fixedFee": 33,
+        "cashOut": 33,
+        "cashIn": 33,
+        "cryptoCurrencies": [
+          "BTC"
+        ],
+        "machine": "9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a",
+        "id": "423a32a9-0bbb-4997-b15a-c6db12334195",
+        "country": "",
+        "languages": []
+      }
+    ],
+    "cashOut_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_bottom": 33,
+    "cashOut_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_top": 12,
+    "cashOut_9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a_active": true,
+    "notifications_email_active": true,
+    "notifications_sms_active": true,
+    "notifications_sms_transactions": true,
+    "notifications_email_compliance": true,
+    "notifications_highValueTransaction": 12,
+    "notifications_fiatBalanceCassette2": 42,
+    "notifications_fiatBalanceCassette1": 32,
+    "notifications_fiatBalanceOverrides": [
+      {
+        "cassette2": 67,
+        "cassette1": 556,
+        "machine": "9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a",
+        "id": "18114e5b-e6e6-4e0e-a7bc-2cc4ad605d12"
+      }
+    ],
+    "notifications_cryptoLowBalance": 23,
+    "notifications_cryptoHighBalance": 56,
+    "notifications_cryptoBalanceOverrides": [
+      {
+        "highBalance": 66,
+        "lowBalance": 545,
+        "cryptoCurrency": "ETH",
+        "id": "b59e4310-bca1-435c-a89e-b861a7de9b93"
+      },
+      {
+        "highBalance": 23,
+        "lowBalance": 51,
+        "cryptoCurrency": "DASH",
+        "id": "a1f5ac7a-4b05-4ec7-8744-4d77c0555f5b"
+      }
+    ],
+    "locale_overrides": [
+      {
+        "id": "f0f9248d-96da-4db5-b592-625251da0203",
+        "machine": "9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a",
+        "country": "US",
+        "languages": [
+          "en-CA"
+        ],
+        "cryptoCurrencies": [
+          "ETH"
+        ]
+      }
+    ],
+    "receipt_active": "on",
+    "receipt_operatorWebsite": false,
+    "receipt_operatorEmail": false,
+    "receipt_operatorPhone": false,
+    "receipt_companyRegistration": true,
+    "receipt_machineLocation": false,
+    "receipt_customerNameOrPhoneNumber": true,
+    "receipt_exchangeRate": false,
+    "receipt_addressQRCode": false,
+    "notifications_sms_balance": true,
+    "notifications_sms_compliance": true,
+    "notifications_sms_errors": true,
+    "notifications_email_errors": true,
+    "notifications_email_transactions": true,
+    "notifications_email_balance": true
+  },
+  "accounts": {}
+}
\ No newline at end of file
diff --git a/test/unit/new-settings-loader.js b/test/unit/new-settings-loader.js
new file mode 100644
index 00000000..8948f06d
--- /dev/null
+++ b/test/unit/new-settings-loader.js
@@ -0,0 +1,17 @@
+import test from 'ava'
+import _ from 'lodash/fp'
+import settings from '../../db.json'
+
+import configManager from '../../lib/new-config-manager'
+
+const machineId = '9682f15e40539e40d3e4050a993cf74e3e157d6d9b7866fb1ebd5206024ae68a'
+const config = settings.config
+
+test('first examples', () => {
+  const triggers = configManager.getTriggers(config)
+  const filtered = _.filter(_.matches({ triggerType: 'volume', cashDirection: 'both' }))(triggers)
+  const grouped = _.groupBy(_.prop('requirement'))(filtered)
+  const final = _.mapValues(_.compose(_.get('threshold'), _.minBy('threshold')))(grouped)
+
+  console.log(final)
+})
\ No newline at end of file