big reffactor, as well as all server connections working