I think the best place to start is (2) let’s hide it from the selector for now.
@techAPJ can you take care of it?