- Future improve/clean up the now generic follow stream code