finishing up server side