Some progress on mapping, and updated pom.