Updates to Streaming and General Infrastructure

[snuffyDev]

As mentioned in #82 (comment) this is where I will post updates about general infrastructure changes and minor changes involving streaming