Finished a basic implementation to add and watch streams. Not tested yet; this is a backup.