added event manager
resolved merge conflict
committing changes before big refactoring - removing test signals
cleaned up evaluation model
resolved merge conflict (supposedly)