Trying to get the server to work
Merge branch 'Tobias' into Emily