added map etc?

Not sure about this.