diff --git a/src/components/Activity.tsx b/src/components/Activity.tsx
index 438c08c..42941bf 100644
--- a/src/components/Activity.tsx
+++ b/src/components/Activity.tsx
@@ -46,11 +46,14 @@ const SubtleText: ParentComponent = (props) => {
     return <h3 class='text-xs text-gray-500 uppercase'>{props.children}</h3>
 }
 
-function OnChainItem(props: { item: OnChainTx }) {
+function OnChainItem(props: { item: OnChainTx, labels: string[] }) {
+    const [store, actions] = useMegaStore();
     const isReceive = createMemo(() => props.item.received > 0);
 
     const [open, setOpen] = createSignal(false)
 
+
+
     return (
         <>
             <JsonModal open={open()} data={props.item} title="On-Chain Transaction" setOpen={setOpen}>
@@ -58,9 +61,10 @@ function OnChainItem(props: { item: OnChainTx }) {
                     Mempool Link
                 </a>
             </JsonModal>
+            {JSON.stringify(props.labels)}
             <ActivityItem
                 kind={"onchain"}
-                labels={[]}
+                labels={props.labels}
                 amount={isReceive() ? props.item.received : props.item.sent}
                 date={props.item.confirmation_time?.Confirmed?.time}
                 positive={isReceive()}
@@ -85,11 +89,20 @@ function OnChainItem(props: { item: OnChainTx }) {
     )
 }
 
-function InvoiceItem(props: { item: MutinyInvoice }) {
+function InvoiceItem(props: { item: MutinyInvoice, labels: string[] }) {
+    const [store, actions] = useMegaStore();
     const isSend = createMemo(() => props.item.is_send);
 
     const [open, setOpen] = createSignal(false)
 
+    const labels = createMemo(() => {
+        const labels = store.mutiny_wallet?.get_address_labels();
+        console.log(labels);
+        if (!labels) return ["abcdefg"];
+        return labels;
+        // return labels.filter((label) => label.address === props.item.txid)
+    })
+
     return (
         <>
             <JsonModal open={open()} data={props.item} title="Lightning Transaction" setOpen={setOpen} />
@@ -145,92 +158,6 @@ function Utxo(props: { item: UtxoItem }) {
     )
 }
 
-export function Activity() {
-    const [state, _] = useMegaStore();
-
-    const getTransactions = async () => {
-        console.log("Getting onchain txs");
-        const txs = await state.mutiny_wallet?.list_onchain() as OnChainTx[];
-        return txs.reverse();
-    }
-
-    const getInvoices = async () => {
-        console.log("Getting invoices");
-        const invoices = await state.mutiny_wallet?.list_invoices() as MutinyInvoice[];
-        return invoices.filter((inv) => inv.paid).reverse();
-    }
-
-    const getUtXos = async () => {
-        console.log("Getting utxos");
-        const utxos = await state.mutiny_wallet?.list_utxos() as UtxoItem[];
-        return utxos;
-    }
-
-    const [transactions, { refetch: _refetchTransactions }] = createResource(getTransactions);
-    const [invoices, { refetch: _refetchInvoices }] = createResource(getInvoices);
-    const [utxos, { refetch: _refetchUtxos }] = createResource(getUtXos);
-
-    return (
-        <VStack>
-            <Suspense>
-                <Card title="On-chain">
-                    <Switch>
-                        <Match when={transactions.loading}>
-                            <LoadingSpinner wide />
-                        </Match>
-                        <Match when={transactions.state === "ready" && transactions().length === 0}>
-                            <code>No transactions (empty state)</code>
-                        </Match>
-                        <Match when={transactions.state === "ready" && transactions().length >= 0}>
-                            <For each={transactions()}>
-                                {(tx) =>
-                                    <OnChainItem item={tx} />
-                                }
-                            </For>
-                        </Match>
-                    </Switch>
-                </Card>
-                <Card title="Lightning">
-                    <Switch>
-                        <Match when={invoices.loading}>
-                            <LoadingSpinner wide />
-                        </Match>
-                        <Match when={invoices.state === "ready" && invoices().length === 0}>
-                            <code>No invoices (empty state)</code>
-                        </Match>
-                        <Match when={invoices.state === "ready" && invoices().length >= 0}>
-                            <For each={invoices()}>
-                                {(invoice) =>
-                                    <InvoiceItem item={invoice} />
-                                }
-                            </For>
-                        </Match>
-                    </Switch>
-                </Card>
-                <Card title="UTXOs">
-                    <Switch>
-                        <Match when={utxos.loading}>
-                            <LoadingSpinner wide />
-                        </Match>
-                        <Match when={utxos.state === "ready" && utxos().length === 0}>
-                            <code>No utxos (empty state)</code>
-                        </Match>
-                        <Match when={utxos.state === "ready" && utxos().length >= 0}>
-                            <For each={utxos()}>
-                                {(utxo) =>
-                                    <Utxo item={utxo} />
-                                }
-                            </For>
-                        </Match>
-                    </Switch>
-                    <ButtonLink href="/redshift" layout="small" class="flex items-center gap-2 self-center hover:text-m-red">Redshift <img src={wave} class="h-4" alt="redshift"></img></ButtonLink>
-                </Card>
-            </Suspense>
-        </VStack>
-    )
-
-}
-
 type ActivityItem = { type: "onchain" | "lightning", item: OnChainTx | MutinyInvoice, time: number }
 
 function sortByTime(a: ActivityItem, b: ActivityItem) {
@@ -267,6 +194,21 @@ export function CombinedActivity(props: { limit?: number }) {
 
     const [activity] = createResource(getAllActivity);
 
+    const addressLabels = createMemo(() => {
+        const labels = state.mutiny_wallet?.get_address_labels();
+        console.log(labels);
+        return labels || [];
+        // return labels.filter((label) => label.address === props.item.txid)
+    })
+
+    const invoiceLabels = createMemo(() => {
+        const labels = state.mutiny_wallet?.get_address_labels();
+        console.log(labels);
+        if (!labels) return ["abcdefg"];
+        return labels;
+        // return labels.filter((label) => label.address === props.item.txid)
+    })
+
     return (
         <Switch>
             <Match when={activity.loading}>
@@ -280,10 +222,12 @@ export function CombinedActivity(props: { limit?: number }) {
                     {(activityItem) =>
                         <Switch>
                             <Match when={activityItem.type === "onchain"}>
-                                <OnChainItem item={activityItem.item as OnChainTx} />
+                                {/* FIXME */}
+                                <OnChainItem item={activityItem.item as OnChainTx} labels={[]} />
                             </Match>
                             <Match when={activityItem.type === "lightning"}>
-                                <InvoiceItem item={activityItem.item as MutinyInvoice} />
+                                {/* FIXME */}
+                                <InvoiceItem item={activityItem.item as MutinyInvoice} labels={[]} />
                             </Match>
                         </Switch>
                     }
diff --git a/src/routes/Receive.tsx b/src/routes/Receive.tsx
index 00031f5..130a710 100644
--- a/src/routes/Receive.tsx
+++ b/src/routes/Receive.tsx
@@ -51,6 +51,10 @@ type ReceiveFlavor = "unified" | "lightning" | "onchain"
 type ReceiveState = "edit" | "show" | "paid"
 type PaidState = "lightning_paid" | "onchain_paid";
 
+function tagItemsToLabels(items: TagItem[]) {
+    return items.map(item => item.kind === "contact" ? item.id : item.name)
+}
+
 export default function Receive() {
     const [state, _] = useMegaStore()
     const navigate = useNavigate();
@@ -103,9 +107,11 @@ export default function Receive() {
 
     async function getUnifiedQr(amount: string) {
         const bigAmount = BigInt(amount);
+        console.log(selectedValues());
+        console.log(tagItemsToLabels(selectedValues()))
         try {
             // FIXME: actual labels
-            const raw = await state.mutiny_wallet?.create_bip21(bigAmount, []);
+            const raw = await state.mutiny_wallet?.create_bip21(bigAmount, tagItemsToLabels(selectedValues()));
             // Save the raw info so we can watch the address and invoice
             setBip21Raw(raw);