Allow server to take an argument

Just adding the changes we made locally the other day to the files in the repo too!