Near finished Map engine