refactor: extend -> override
WIP re #12, #13, #14