Some of the infrastructure for narrowing, but not rendering it properly yet