lots broken, but making a safety commit