Extinguisher works now

Commit before I break anything