Globalisation changes
Fixes #38 and #39
Contact Implementation fixes