WIP, some more logging.