Add some logging WIP