Added a simple focal length calculation. (too tired took me ages.)
Resolved conflict.