diff --git a/Yubikey.md b/Yubikey.md
index 869ab26..1891023 100644
--- a/Yubikey.md
+++ b/Yubikey.md
@@ -38,6 +38,14 @@ The `GPG-Suite` application needs to be installed on macOS in order to interact
 brew install gpg-suite-no-mail
 ```
 
+> Note: GPG-Suite also installs a GUI for the pinentry program used by PGP, which doesn't seem to
+> work well with the yubikey (I also don't like GUI's generally). Need to add the following line to
+> `~/.gnupg/gpg-agent.conf`.
+
+```bash
+echo "pinentry-program /opt/homebrew/bin/pinentry" >> ~/.gnupg/gpg-agent.conf
+```
+
 This then gives you access to use the `gpg --card-edit` command that allows you to add gpg-keys to
 the yubikey itself.
 
@@ -248,6 +256,12 @@ cd ~/.ssh && ssh-keygen -K
 > different password stores, I may have to consolidate them into a single store to make the friction
 > less.
 
+## TOTP setup
+
+Move TOTP tokens from current password manager and into the Yubico-Authenticator application, so
+that they are more secure / require the hardware yubikey. Saved the secrets inside current password
+manager so that they can be setup on the backup yubikey when it arrives.
+
 ## Setting Up at First Financial Bank {#first-financial-bank}
 
 When setting up I could only use my phone it wouldn't allow me on my computer. Once you tap the