dybr

 Not much to say; fixed all the merge troubles, decryption works, pushed one pr with all that, and another pr for deployment of the previous pr to staging.

Some of the work was done in the airport, CLT, where I am now.