Adding map integration, plus initial encounter code, more navigation