file table refactor wip