Refactoring and added some tests.  Now I'm working on the patterns for Arrays and Objects.