Look into keeping this stuff tabbed in so that the patch is smaller.