Refactor

Added streaming stuff. Removed stuff.