Major changes to the ConvertQB class. More to do...
More fixes.