Switched to struct to store input information