WIP.   Modified/added logging message.