TODO to remind myself about factoring out random maps