2 Commits (wip/use-selectionmodel)