Lighting and textures

I'm not entirely sure what this does, hopefully it'll allow me to merge these branches together so we end up with something that works...