Refined architecture, added filtering following bouchaud and gatheral, Broken for now.