Home Controller refactored