Overhaul to locations and Relationships.
Signed-off-by: Chris Mullen <cbmullen@gmail.com>