Working on Jetty migration (messy)