Added logging, in prep for verification