Initial work on clumps counter (yet to integrate into main)