tweet refactor. preparing streams now