Added code for more functionality, jetty running, tests passing.