Completed map integration
Map now fully functional