Major Refactor and Residence Resource

I'm wondering if it should be done here or on the insert? Here is probably as good a place as any.