Event rigging

Properly linked friend classes. Adjusted some members to static.