- Add some functionality.  No streaming yet.