Working copy for graphics system de-merge

that's a lot of work.