Another year, another refactor…