adding uncompression + refactoring and setting up for iterative testing
renamed variables to make more sense