closes #163 by using container instead of event manager directly