Continuing with refactoring - split selection into model and view