More logging and organizing.