Started working refraction
Merge