Working on chunk code, re-ordering chunks and new tests (add it to original branch)