WIP: more map/reduce work