added some Server stuff still unfinished