lotsa map changes. overwriting jeremy's code. going to get re-added