Done with first draft
Merge branch 'master' of github.com:WheatonWHALE/server-files