Updated to add in actual server listing
Not fully complete