Added Map Functionality. Biggest update yet!