Chunk Cleanup

First major change regarding chunk handling