Second try of origin dict

Boy I am making a mess of this!