Added in some stuff to experiment with maps.