More work on the FX and stuff.