Part 2: Pet and Shelter...should have noted this on previous commit
* Marked what to later refactor