Feature/crossfilter

ok, no problem if you think it makes things clear....