Now handles most of user story 4 -- except outputting the results properly.