added map and template to work off of