mapping started, much untested code
mapping started, much untested code