all done, only need to add code switching to US locale