continued refactoring
added more detail around location / postcode lookups
merged