Started redoing the loading code.