diff --git a/app/controllers/locations_controller.rb b/app/controllers/locations_controller.rb
index fd9d1d4..401e657 100644
--- a/app/controllers/locations_controller.rb
+++ b/app/controllers/locations_controller.rb
@@ -12,9 +12,10 @@ class LocationsController < ApplicationController
     def create
         created_location = Location.create(params["location"])
         if params["id"]
-            updated_person = Person.setHome(params["id"], created_location.id)
+            updated_person = Person.setHome(params["id"], created_location)
+            created_location.inhabitants.push(updated_person)
         end
-        render json: { location: created_location, person: updated_person }
+        render json: created_location
     end
 
     def delete
diff --git a/app/models/person.rb b/app/models/person.rb
index 5d9b320..cca3c2f 100644
--- a/app/models/person.rb
+++ b/app/models/person.rb
@@ -50,13 +50,13 @@ class Person
         return Person.new(results.first)
     end
 
-    def self.setHome(person_id, home_id)
+    def self.setHome(person_id, home)
         results = DB.exec(
             <<-SQL
                 UPDATE people
-                SET home_id = #{home_id}
+                SET home_id = #{home.id}
                 WHERE id = #{person_id}
-                RETURNING id, name, age, home_id;
+                RETURNING id, name, age;
             SQL
         )
         return Person.new(results.first)