Refactored the Homeless class

1. Will rename this class at some point....