WIP Encoder
merge