JettyBranch Initial Changes

Hi all!

Here are my initial changes...