Progress but still a mess. Tuesday AM deadline looms.