WIP - expanded functionality of IoC container, created a basic event manager
Fixed some issues, moved some stuff around.