lots of added logic, mocked out data, tests fixed