Refactored some uglyness out of main class. Added more structure to simulation events.