Add EDOStream

EDIStream and EDOStream are both still untested!