All tests pass, need to work on the collectors.