Major Refactor and Residence Resource

Did some more reading into this, and its kind of in the air.  You HAVE to return the URI, but it can also return the resource.  Might as well do both, should just make sure we're consistent.