First pass at Server Side Events
Merging Conflicts from pull request