Adds streaming versions and refactors code

Adds streaming versions and refactors code #45