Map introduced

And more brokeness also