Condense

This now passes all tests. Merging.