13: Can now touch map.  Started cleanup of swiping.