Merged FileServer code from Matt's pull request