Feature/crossfilter

Do you want to keep all this commented code?