Some better logging c/o firschman