integrated almost all code to to use new Stream class, plotting doesn't work yet

building works, needs major cleanup