Added some logging scaffolding