Add in debug logging infrastructure