Added basic server stuff