API working, streams almost all in place