Major Refactor and Residence Resource