merging with bon
Merge branch 'master' of github.com:nhindman/odgp_famousTest
map is working but affecting performance on mobile