Basically rewrite everything to use streams. Include really basic filter for matching the event stream.