New scope mapper working to some extent.