added basic shading
merge
in the middle of the job on translation
merge