WIP: split up decompress