Did some more refactoring of the loading system.  Still not 100% operational.