Some more unit tests and decoupling layers
Starting to put subchunks in separate collection, good luck