Temp commit. Finally got the various load paths working together