Fixes the tokenizers using collector
wip
wip
Moves functions to utils
wip
fix