Added basic map functionality
Working on mapping features