Quit detection

Uhg, always fail at merging properly.