Broken commit, working on path generation and locales