Added Compressor

Also renamed some variables