WIP -- render @events on a per-location basis
Finish merge