Quench WIP 2

by Paul Rogers