Refactored and create logic to handle into a single class. Added Builder pattern to create an event.
Merge remote-tracking branch 'origin/master'