TODO: back on track for subscrition to feeds