Working on mapping generator...