About to add select functionality