Starting to make this server friendly