Add much more complete map demo