This study models a representative building with a modulating air-sourced heat pump, a photovoltaic system, a battery, and thermal storage systems for floor heating and hot-water supply, and finds that the battery, naturally, is the essential building block for improving self-sufficiency.