More work on hooking up select tool