filling in more high-level @extend logic