Map is now fully functional!