More updates, adding logging.