intial stream work
cross stream aka merge conflicts fixed