Added map back in and added some additional structure for next steps.