Began shader/mesh logic for lamps
merge fix