Putting currency handling back in.