Added some Server listen code