Made event more modular

Now handles Fire, In block, and Water overlays