Major Refactor and Residence Resource

I don't think this call should return the user.