Now manually inserting shader attributes.

All tests pass. Now need to modify viewer.