I think this is working now -- still untested dir loading routines.