Partially completed loading files at startup

Not building, just checking in to avoid losing work.