First attempt at adding the streams