Lights, camera, action
merge conflicts fixed?