More logging and all.