Specular business

Still moves strangely
Resolved conflicts