rework count a bit
build dictionary. doesn't seem to work, yet
upstream from plugin