map functionality largely complete
Merge branch 'master' into development_l