Resolves #42

File upload and server config now handled correctly