worked on messagestream, almost done