Update server code to match waddle web