Added Map functionality -needs some work -no errors but wont load