Fixed iterative mapping, working on speed vs. resources testing