Add matrix uniforms
Add haddocks
More haddocks