Begin using streaming for a neater API
An api only stop, just for now
Merge branch 'streamable'