Some updates to both files. Still trouble with getting the results to reflect the user input...