Add JIT loading of password file

Move things around