Bunch of untested encoding work