Add some sensible logging #7