I am stupid
Merge remote-tracking branch 'erik/master'
better shadows