Switched to a Service instead of an eventservice
merge
Fixed merging bug and deleted EPL generation stuff