Move kind from address table to locatable. Start configuring views to work with the change.