Continued grenade work

Grenade keeps exploding instantly.
Revert "Continued grenade work"

This reverts commit 9f4dd8e62c74a861537481f1038192d506de2815.
Revert "Revert "Continued grenade work""

This reverts commit b9e71abdb6d5b32c4a203f008c140cdbcaf3cf11.