Making streamy-ish. Mid refactor.
Refactoring object structure.