Adding ability to select a unit.