Starting on file admin refactor