Changing how we handle input. Moving away from regex.