Refactored to have a home controller