Refactor first test
Add Builder
Satisfy key value test
Refactor Proxy
Refactor classes
Satisfy nil and no value tests