Item selection feature

should update master fully now.