Changed the name of the Selector to selector and added some work on the bin optimization. This will probably not be needed