Replacing data with objects containing addresses.
Merge pull request #1 from DavidEBest/master

Replacing data with objects containing addresses.