adds some basic eventsource code
fixes merge conflict