Additional work on chunks.

Almost there

Signed-off-by: Chris Sanders <zidane@outlook.com>