Rewrote to conform to new Selectables API