Configuration properly saves (helps to register the event).
Moved around a few things in the proxies.