gw_events rewritten

Rewrite not complete yet, but it is close.