Adding map feature

still in progress