begin refactor of File commands