Work on new graphics pipeline

- Previous commit didn't include all changes