more work on new map loader