add server - strange refactor