restructure, need updates for map change