Starting rework of asset load/unload. Fixed Map?