Need to finish up map/var/let