Halfway done with map logic