Map view support

Chris, love some eyes on this.