This should be 100% test coverage! Important milestone for 2.0.