pull in upstream code
Add a simple map