Fixed logic, equals, and other issues... must now get the tests to run!