More effective chunking

Resolves #185