Added map and initial function work