Model rework
More work on the new selection subsystem
More work on the dynamic selection infrastructure