event manager fix, still working on new serializer