move ListMap to a better place