Refactor.
IOC, initial selected items now highlighted.