Light rework of Locations so the admin console works.  Need to refactor Locations and Properties to separate out types and properties.