First pass at Addresses resources
Tests for addresses
Merge branch 'addresses'