file server overhaul
resolve merge conflicts