Collapse blocks and hunks (part 1)...

Made a "hunk_factory" that does unique_blocks and pair_blocks together.
Get to a point where a test can be run on the hunk_factory (needs more work)
WIP reworking diff stuff