Initial changes in new branch for additional logging