Starting to add more logging - work in progress -  task #12