Overhauled input and added selection