[WIP] Step up our logging game

Will fix #217