Refactored to leverage jaeb.
Refactored to new object structure.