Finishing first CLI
Fixing EventManager