New event system seems to be working, but still has many problems.  Old one is still in place.