Working multipoint maps! Credit to Alan Lai, cleanup