map mostly working, needs to increment properly