initial round of work on accents handling