Clean up reduction
Clean up, move stuff around
Clean up, move stuff around
Impl some tests, cleanup others
Grinding tests
Cleaning up