First wave of "die" feature.
Github bug #15