lots of server stuff added