Add a pile of TODOs to make sense out of this mapping strategy stuff