Clean up
Added streamer (WIP)