Adding server stuff as well