Fixed up the new select functionality, Taylor will continue it further