Updating to new code for jetty, in progress