Added Residence hook (UNTESTED)
Some minor rebalancing