Passed three of five final tests; refactoring code to make a separate table for states.