Overhaul ranges and mapreduce
Refactor: rename to simply Range