Added in map, need to hook up data and map