Advice needed - General Contractor issue