Try to handle more of this gbs stuff.