File tables near complete, need bug testing