wip prep commit in lieu of gfx subsystem update changes.