Feature/crossfilter

more commented stuff, if it is not necessary for the future, I think you can delete it...