Working through the file loading issues

Still more to be fixed.