changes to server
init
commented out lines for test