NOT A USABLE COMMIT ; Bot kind of works, but if you enable both mux and bot it breaks (bad singletons?)