Requests for comment/Data mapper

Tests and example edit