Finished issue #86. MapBox data appears to be working quite well.