WIP: Major refactor to single-mapper interface.

Updated cedar.