Initial changes for refactoring
Refactors
Working multi-select