Added map, almost working