translation refactor work -- its looking pretty good.